From 86b08bc142d4be6c23e8a4729695837687626e55 Mon Sep 17 00:00:00 2001
From: Stephan Porada <sporada@uni-bielefeld.de>
Date: Thu, 12 Sep 2019 11:42:33 +0200
Subject: [PATCH] Add logging for production. Mount web.env into opaque_daemon.

---
 config.py          | 13 ++++++++++++-
 docker-compose.yml |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index 7ed0590d..31beaa4b 100644
--- a/config.py
+++ b/config.py
@@ -46,7 +46,7 @@ class DevelopmentConfig(Config):
                         format=log_format, datefmt='%Y-%m-%d %H:%M:%S',
                         filemode='w')
     logger = logging.getLogger(__name__)
-    logger.info('Logging has started.')
+    logger.info('Logging has started with level WARNING.')
 
 
 class TestingConfig(Config):
@@ -67,6 +67,17 @@ class ProductionConfig(Config):
         os.environ.get('POSTGRES_PASSWORD'),
         os.environ.get('POSTGRES_DB_NAME')
     )
+    if not os.path.isfile('logs/opaque_web.log'):
+        file_path = os.path.join(os.getcwd(), 'logs/opaque_web.log')
+        log = open(file_path, 'w+')
+        log.close()
+    log_format = ("%(asctime)s - %(levelname)s - %(name)s - "
+                  "%(filename)s - %(lineno)d - %(message)s")
+    logging.basicConfig(filename='logs/opaque_web.log', level='ERROR',
+                        format=log_format, datefmt='%Y-%m-%d %H:%M:%S',
+                        filemode='w')
+    logger = logging.getLogger(__name__)
+    logger.info('Logging has started with level ERROR.')
 
 
 config = {
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b490b54..601414f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,9 @@ services:
       placement:
         constraints:
           - node.role == manager
-    env_file: db.env
+    env_file:
+      - db.env
+      - web.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
     volumes:
       - ./logs/opaque_daemon.log:/home/opaque_daemon/logs/opaque_daemon.log
-- 
GitLab