Merge pull request #12 from datasci4health/development

Development
harena-lab · May 25, 2019 · a895901 · a895901
2 parents d3f8d6e + e4a781d
commit a895901
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,29 +11,29 @@ services:
       - HARENA_LOGGER_FLASK_DEBUG=False
       - HARENA_LOGGER_BROKER_HOST=harena-logger-broker
       - HARENA_LOGGER_BROKER_PORT=1883
-      - HARENA_LOGGER_MONGODB_HOST=harena-logger-mongodb
+      - HARENA_LOGGER_MONGODB_HOST=harena-logger-rawdata
       - HARENA_LOGGER_MONGODB_PORT=27017
       - HARENA_LOGGER_MONGODB_DB=harena_logger
       - HARENA_LOGGER_MONGODB_COLLECTION=executions
     ports:
       - 10030:10030
     depends_on:
       - harena-logger-broker
-      - harena-logger-mongodb
+      - harena-logger-rawdata
     restart: always
     networks:
       - harena-logger
 
 
-  harena-logger-mongodb:
+  harena-logger-rawdata:
     image: mongo:latest
     environment:
       - MONGO_DATA_DIR=/data/db
       - MONGO_LOG_DIR=/dev/null
     ports:
       - 10031:27017
     volumes:
-      - harena_logger_mongodb:/data/db      
+      - harena_logger_rawdata:/data/db      
     # command: mongod --smallfiles --logpath=/dev/null # --quiet
     networks:
       - harena-logger
@@ -49,7 +49,7 @@ services:
 
 
 volumes:
-  harena_logger_mongodb:
+  harena_logger_rawdata:
 
 
 networks:

diff --git a/src/config.py b/src/config.py
@@ -2,14 +2,17 @@
 
 class Config(object):
 
-    HARENA_LOGGER_BROKER_HOST        = os.environ.get('HARENA_LOGGER_BROKER_HOST',         'localhost')
-    HARENA_LOGGER_BROKER_PORT        = int(os.environ.get('HARENA_LOGGER_BROKER_PORT',           1883))
-
     HARENA_LOGGER_FLASK_HOST         = os.environ.get('HARENA_LOGGER_FLASK_HOST',            '0.0.0.0')
-    HARENA_LOGGER_FLASK_PORT         = int(os.environ.get('HARENA_LOGGER_FLASK_PORT',            5000))
+    HARENA_LOGGER_FLASK_PORT         = int(os.environ.get('HARENA_LOGGER_FLASK_PORT',           10030))
     HARENA_LOGGER_FLASK_DEBUG        = bool(os.environ.get('HARENA_LOGGER_FLASK_DEBUG',         False))
 
     HARENA_LOGGER_MONGODB_HOST       = os.environ.get('HARENA_LOGGER_MONGODB_HOST',        'localhost')
-    HARENA_LOGGER_MONGODB_PORT       = int(os.environ.get('HARENA_LOGGER_MONGODB_PORT',         27017))
+    HARENA_LOGGER_MONGODB_PORT       = int(os.environ.get('HARENA_LOGGER_MONGODB_PORT',         10031))
     HARENA_LOGGER_MONGODB_DB         = os.environ.get('HARENA_LOGGER_MONGODB_DB',      'harena_logger')
     HARENA_LOGGER_MONGODB_COLLECTION = os.environ.get('HARENA_LOGGER_MONGODB_COLLECTION', 'executions')
+
+
+    HARENA_LOGGER_BROKER_HOST        = os.environ.get('HARENA_LOGGER_BROKER_HOST',         'localhost')
+    HARENA_LOGGER_BROKER_PORT        = int(os.environ.get('HARENA_LOGGER_BROKER_PORT',          10032))
+
+