Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344279 )
Change subject: Pass environment variables to the subprocess
......................................................................
Pass environment variables to the subprocess
Change-Id: I28e47729b3ee0d7f5566e530eaa032767347a101
TODO: Needs a test
---
M README.md
M processcontrol/job_wrapper.py
2 files changed, 10 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/79/344279/1
diff --git a/README.md b/README.md
index e53da2c..4ad5e7c 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,10 @@
# Optional timeout in seconds, after which your job will be
# aborted. Defaults to 10 minutes, JobWrapper.DEFAULT_TIMEOUT
timeout: 30
+
+# Optional environment variables.
+environment:
+ PYTHONPATH: /usr/share/invisible/pie
```
Running
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 99fad1c..e57278e 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -30,12 +30,17 @@
if not self.config.has("schedule"):
self.enabled = False
+ if self.config.has("environment"):
+ self.environment = self.config.get("environment")
+ else:
+ self.environment = {}
+
def run(self):
lock.begin(job_tag=self.name)
command = shlex.split(self.config.get("command"))
- self.process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
+ self.process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=self.environment)
timer = threading.Timer(self.timeout, self.fail_timeout)
timer.start()
--
To view, visit https://gerrit.wikimedia.org/r/344279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28e47729b3ee0d7f5566e530eaa032767347a101
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
