Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345265 )
Change subject: mini-lock login encapsulation
......................................................................
mini-lock login encapsulation
Change-Id: I432e10c6ec653af7ec49c97aed910c9695285985
---
M processcontrol/job_wrapper.py
M processcontrol/lock.py
2 files changed, 9 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/65/345265/1
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 83f396a..fa72eab 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -140,9 +140,8 @@
Do not use this function to gate the workflow, explicitly assert the
lock instead."""
- # FIXME: DRY
- run_dir = self.global_config.get("run_directory")
- lock_path = "/{run_dir}/{name}.lock".format(run_dir=run_dir,
name=self.slug)
+ # FIXME: DRY--find a good line to cut at to split out lock.read_pid.
+ lock_path = lock.path_for_job(self.slug)
if os.path.exists(lock_path):
with open(lock_path, "r") as f:
pid = int(f.read().strip())
diff --git a/processcontrol/lock.py b/processcontrol/lock.py
index b5142ad..004439a 100644
--- a/processcontrol/lock.py
+++ b/processcontrol/lock.py
@@ -11,10 +11,15 @@
lockfile = None
+def path_for_job(job_name):
+ run_dir = config.GlobalConfiguration().get("run_directory")
+ filename = "{run_dir}/{name}.lock".format(run_dir=run_dir, name=job_name)
+ return filename
+
+
# TODO: Decide whether we want to failopen?
def begin(failopen=False, job_tag=None):
- run_dir = config.GlobalConfiguration().get("run_directory")
- filename = "{run_dir}/{name}.lock".format(run_dir=run_dir, name=job_tag)
+ filename = path_for_job(job_tag)
if os.path.exists(filename):
config.log.error("Lockfile found!")
--
To view, visit https://gerrit.wikimedia.org/r/345265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I432e10c6ec653af7ec49c97aed910c9695285985
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
