Switches to merging config strategy and bumps yamlconf requirement to…

… 0.1.0

ores.wmflabs.org.yaml → config/00-main.yaml

@@ -11,7 +11,8 @@ ores:
 score_caches:
   ores_redis:
     class: ores.score_caches.Redis
-    host: ores-redis
+    host: ores-redis-01
+    port: 6380
     prefix: "ores"
     socket_timeout: 15
 
@@ -48,9 +49,9 @@ score_processors:
       - wikidatawiki
   ores_celery:
     class: ores.score_processors.Celery
-    BROKER_URL: redis://ores-redis
+    BROKER_URL: redis://ores-redis-01:6379
     BROKER_TRANSPORT_OPTIONS: {'socket_timeout': 15} # seconds
-    CELERY_RESULT_BACKEND: redis://ores-redis
+    CELERY_RESULT_BACKEND: redis://ores-redis-01:6379
     CELERY_ACCEPT_CONTENT: ['pickle']
     CELERY_TASK_SERIALIZER: 'pickle'
     CELERY_RESULT_SERIALIZER: 'pickle'

ores_celery.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
+import glob
 import logging
 import logging.config
 
 import yamlconf
+
 from ores.score_processors import Celery
 
-with open("ores.wmflabs.org.yaml") as f:
-    config = yamlconf.load(f)
+config = yamlconf.load(*(open(p) for p in glob.glob("config/*.yaml")))
 
 with open("logging_config.yaml") as f:
     logging_config = yamlconf.load(f)

ores_wsgi.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
+import glob
 import logging
 import logging.config
 
 import yamlconf
 
 from ores.wsgi import server
 
-with open("ores.wmflabs.org.yaml") as f:
-    config = yamlconf.load(f)
+config = yamlconf.load(*(open(p) for p in glob.glob("config/*.yaml")))
 
 with open("logging_config.yaml") as f:
     logging_config = yamlconf.load(f)

requirements.txt

@@ -2,5 +2,6 @@ editquality >= 0.2.1
 ores >= 0.5.7
 redis
 statsd
+yamlconf >= 0.1.0
 wb-vandalism >= 0.1.6
 wikiclass >= 0.2.1