Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343417 )
Change subject: Global config
......................................................................
Global config
Defaults for everything go in /etc/fundraising/crash-override.yaml
Change-Id: I8d6041730dc315fab28dc08a340a7985676bd1fb
---
M job_wrapper.py
1 file changed, 9 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/17/343417/1
diff --git a/job_wrapper.py b/job_wrapper.py
index e1cc9d6..4c0276b 100644
--- a/job_wrapper.py
+++ b/job_wrapper.py
@@ -1,5 +1,6 @@
from __future__ import print_function
import datetime
+import os
import shlex
import subprocess
import sys
@@ -9,14 +10,19 @@
import lock
import mailer
-# TODO: Global config.
DEFAULT_TIMEOUT = 600
-
+GLOBAL_CONFIG_PATH = "/etc/fundraising/crash-override.yaml"
class JobWrapper(object):
def __init__(self, config_path=None):
+ # load global config if it exists
+ try:
+ self.config = yaml.safe_load(open(GLOBAL_CONFIG_PATH, "r"))
+ except:
+ self.config = {}
+
self.config_path = config_path
- self.config = yaml.safe_load(open(config_path, "r"))
+ self.config.update(yaml.safe_load(open(config_path, "r")))
self.validate_config()
self.name = self.config["name"]
--
To view, visit https://gerrit.wikimedia.org/r/343417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d6041730dc315fab28dc08a340a7985676bd1fb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
