Ladsgroup has submitted this change and it was merged.
Change subject: use /etc/ores as config dir
......................................................................
use /etc/ores as config dir
Change-Id: I1a5ce9fc2b7af6bdbeaead90e1605ad15c2b28cc
---
M ores_celery.py
M ores_wsgi.py
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Ladsgroup: Verified; Looks good to me, approved
diff --git a/ores_celery.py b/ores_celery.py
index 5e505bc..2347a11 100644
--- a/ores_celery.py
+++ b/ores_celery.py
@@ -7,7 +7,10 @@
from ores.score_processors import Celery
-config = yamlconf.load(*(open(p) for p in sorted(glob.glob("config/*.yaml"))))
+config_paths = sorted(glob.glob("config/*.yaml") +
+ glob.glob("/etc/ores/*.yaml"))
+
+config = yamlconf.load(*(open(p) for p in config_paths))
with open("logging_config.yaml") as f:
logging_config = yamlconf.load(f)
diff --git a/ores_wsgi.py b/ores_wsgi.py
index 4799f14..ff3f712 100644
--- a/ores_wsgi.py
+++ b/ores_wsgi.py
@@ -7,7 +7,10 @@
from ores.wsgi import server
-config = yamlconf.load(*(open(p) for p in sorted(glob.glob("config/*.yaml"))))
+config_paths = sorted(glob.glob("config/*.yaml") +
+ glob.glob("/etc/ores/*.yaml"))
+
+config = yamlconf.load(*(open(p) for p in config_paths))
with open("logging_config.yaml") as f:
logging_config = yamlconf.load(f)
--
To view, visit https://gerrit.wikimedia.org/r/293685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a5ce9fc2b7af6bdbeaead90e1605ad15c2b28cc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
