From a6f7250eb34940c21bcb510fe4712f524404ccbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Mon, 23 May 2016 12:05:56 +0200
Subject: [PATCH] Richer configuration of logging module through
 config{,_local}.py.

---
 pillar/application/__init__.py |  9 ++-------
 pillar/config.py               | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/pillar/application/__init__.py b/pillar/application/__init__.py
index e593a0ac..3fb5ac02 100644
--- a/pillar/application/__init__.py
+++ b/pillar/application/__init__.py
@@ -1,4 +1,5 @@
 import logging
+import logging.config
 import os
 import tempfile
 from bson import ObjectId
@@ -103,14 +104,8 @@ os.environ.pop('TMPDIR', None)
 
 
 # Configure logging
-logging.basicConfig(
-    level=logging.WARNING,
-    format='%(asctime)-15s %(levelname)8s %(name)s %(message)s')
-
-logging.getLogger('werkzeug').setLevel(logging.INFO)
-
+logging.config.dictConfig(app.config['LOGGING'])
 log = logging.getLogger(__name__)
-log.setLevel(logging.DEBUG if app.config['DEBUG'] else logging.INFO)
 if app.config['DEBUG']:
     log.info('Pillar starting, debug=%s', app.config['DEBUG'])
 
diff --git a/pillar/config.py b/pillar/config.py
index e8e65951..67eb3969 100644
--- a/pillar/config.py
+++ b/pillar/config.py
@@ -70,3 +70,29 @@ FULL_FILE_ACCESS_ROLES = {u'admin', u'subscriber', u'demo'}
 # Client and Subclient IDs for Blender ID
 BLENDER_ID_CLIENT_ID = 'SPECIAL-SNOWFLAKE-57'
 BLENDER_ID_SUBCLIENT_ID = 'PILLAR'
+
+
+# See https://docs.python.org/2/library/logging.config.html#configuration-dictionary-schema
+LOGGING = {
+    'version': 1,
+    'formatters': {
+        'default': {'format': '%(asctime)-15s %(levelname)8s %(name)s %(message)s'}
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'default',
+            'stream': 'ext://sys.stderr',
+        }
+    },
+    'loggers': {
+        'application': {'level': 'INFO'},
+        'werkzeug': {'level': 'INFO'},
+    },
+    'root': {
+        'level': 'WARNING',
+        'handlers': [
+            'console',
+        ],
+    }
+}