From c3b7f8dded063c0a085f7311ddc8efec6559214d Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Nov 24 2020 11:17:37 +0000
Subject: Add configuration for logging


---

diff --git a/docker/greenwave-settings.py b/docker/greenwave-settings.py
index 2ccb3ee..067a9e0 100644
--- a/docker/greenwave-settings.py
+++ b/docker/greenwave-settings.py
@@ -16,3 +16,33 @@ CACHE = {
         'distributed_lock': True
     }
 }
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'loggers': {
+        'greenwave': {
+            'level': 'DEBUG',
+        },
+        'dogpile.cache': {
+            'level': 'DEBUG',
+        },
+    },
+    'handlers': {
+        'console': {
+            'formatter': 'bare',
+            'class': 'logging.StreamHandler',
+            'stream': 'ext://sys.stdout',
+            'level': 'DEBUG',
+        },
+    },
+    'formatters': {
+        'bare': {
+            'format': '[%(asctime)s] [%(process)d] [%(levelname)s] %(name)s: %(message)s',
+            'datefmt': '%Y-%m-%d %H:%M:%S',
+        }
+    },
+    'root': {
+        'level': 'INFO',
+        'handlers': ['console'],
+    },
+}
diff --git a/greenwave/app_factory.py b/greenwave/app_factory.py
index 22ae8f1..6ca4e75 100644
--- a/greenwave/app_factory.py
+++ b/greenwave/app_factory.py
@@ -24,6 +24,10 @@ def create_app(config_obj=None):
     if app.config['PRODUCTION'] and app.secret_key == 'replace-me-with-something-random':
         raise Warning("You need to change the app.secret_key value for production")
 
+    logging_config = app.config.get('LOGGING')
+    if logging_config:
+        logging.config.dictConfig(logging_config)
+
     policies_dir = app.config['POLICIES_DIR']
     log.debug("config: Loading policies from %r", policies_dir)
     app.config['policies'] = load_policies(policies_dir)
diff --git a/greenwave/logger.py b/greenwave/logger.py
index 19ad982..cf51ddc 100644
--- a/greenwave/logger.py
+++ b/greenwave/logger.py
@@ -5,7 +5,7 @@ import sys
 
 
 def log_to_stdout(level=logging.INFO):
-    fmt = '%(asctime)s [pid %(process)5d] %(name)s %(levelname)s %(message)s'
+    fmt = '[%(asctime)s] [%(process)d] [%(levelname)s] %(name)s: %(message)s'
     datefmt = '%Y-%m-%d %H:%M:%S'
     stream_handler = logging.StreamHandler(sys.stdout)
     stream_handler.setLevel(level)