From bd3195919eb19193d507fe8455a57544dc5d5708 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Mar 28 2018 02:48:12 +0000
Subject: [PATCH 1/2] use a more compact log format


---

diff --git a/greenwave/logger.py b/greenwave/logger.py
index 8857a21..84f833b 100644
--- a/greenwave/logger.py
+++ b/greenwave/logger.py
@@ -6,8 +6,7 @@ import sys
 
 def init_logging(app):
     log_level = logging.DEBUG if app.debug else logging.INFO
-    fmt = '[%(filename)s:%(lineno)d] ' if app.debug else '%(module)-12s '
-    fmt += '%(asctime)s %(levelname)-7s %(message)s'
+    fmt = '%(asctime)s [pid %(process)5d] %(name)s %(levelname)s %(message)s'
     datefmt = '%Y-%m-%d %H:%M:%S'
     stream_handler = logging.StreamHandler(sys.stdout)
     stream_handler.setLevel(log_level)

From a80c6fb84805f07e031be4f79c375a63a1bec80a Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Mar 28 2018 02:53:25 +0000
Subject: [PATCH 2/2] configure root logger, disable Flask logging


Makes Greenwave consistent with WaiverDB:
https://pagure.io/waiverdb/pull-request/153

---

diff --git a/greenwave/config.py b/greenwave/config.py
index 70863da..97badc6 100644
--- a/greenwave/config.py
+++ b/greenwave/config.py
@@ -7,6 +7,8 @@ class Config(object):
     A GreenWave Flask configuration.
     """
     DEBUG = True
+    # We configure logging explicitly, turn off the Flask-supplied log handler.
+    LOGGER_HANDLER_POLICY = 'never'
     HOST = '0.0.0.0'
     PORT = 5005
     PRODUCTION = False
diff --git a/greenwave/logger.py b/greenwave/logger.py
index 84f833b..fc1b831 100644
--- a/greenwave/logger.py
+++ b/greenwave/logger.py
@@ -4,11 +4,21 @@ import logging
 import sys
 
 
-def init_logging(app):
-    log_level = logging.DEBUG if app.debug else logging.INFO
+def log_to_stdout(level=logging.INFO):
     fmt = '%(asctime)s [pid %(process)5d] %(name)s %(levelname)s %(message)s'
     datefmt = '%Y-%m-%d %H:%M:%S'
     stream_handler = logging.StreamHandler(sys.stdout)
-    stream_handler.setLevel(log_level)
+    stream_handler.setLevel(level)
     stream_handler.setFormatter(logging.Formatter(fmt=fmt, datefmt=datefmt))
-    app.logger.addHandler(stream_handler)
+    logging.getLogger().addHandler(stream_handler)
+
+
+def init_logging(app):
+    log_level = logging.DEBUG if app.debug else logging.INFO
+    log_to_stdout(level=log_level)
+    # In general we want to see everything from our own code,
+    # but not detailed debug messages from third-party libraries.
+    # Note that the log level on the handler above controls what
+    # will actually appear on stdout.
+    logging.getLogger().setLevel(logging.INFO)
+    logging.getLogger('greenwave').setLevel(logging.DEBUG)