From 14efcbbe258860125eee3cbe38c42a0fc93d7109 Mon Sep 17 00:00:00 2001
From: Tomas Gavenciak <gavento@ucw.cz>
Date: Sun, 25 Oct 2015 12:22:55 +0100
Subject: [PATCH] Update logging - vystup i do konzole

---
 mamweb/settings_common.py | 37 ++++++++++++++++++++++++++++++++++++-
 mamweb/settings_local.py  |  3 +++
 mamweb/settings_prod.py   | 18 +++---------------
 mamweb/settings_test.py   |  4 +++-
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py
index 5833d80b..4fe25374 100644
--- a/mamweb/settings_common.py
+++ b/mamweb/settings_common.py
@@ -186,7 +186,42 @@ try:
 except:
     SECRET_KEY = '12345zmr_k53a*@f4q_+ji^o@!pgpef*5&8c7zzdqwkdlkj'
 
-
+# Logging
+
+LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': True,
+
+        'formatters': { 
+            'verbose': { 
+                'format': '%(levelname)s %(asctime)s %(module)s: %(message)s' 
+                }, 
+            }, 
+
+        'loggers': {
+            # Catch-all logger
+            '': {
+                'handlers': ['console'], # Add 'mail_admins' in prod (and test?)
+                'level': 'DEBUG',
+                },
+
+            },
+
+        'handlers': {
+
+            'console': {
+                'level': 'INFO', ## Set to 'DEBUG' in local (and test?)
+                'class': 'logging.StreamHandler',
+                'formatter': 'verbose', 
+                },
+
+            'mail_admins': {
+                'level': 'ERROR',
+                'class': 'django.utils.log.AdminEmailHandler',
+                'formatter': 'verbose', 
+                },
+            },
+        }
 
 # MaM specific
 
diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py
index f55679f8..54bef63e 100644
--- a/mamweb/settings_local.py
+++ b/mamweb/settings_local.py
@@ -36,3 +36,6 @@ DATABASES = {
     }
 }
 
+# LOGGING
+
+LOGGING['handlers']['console']['level'] = 'DEBUG'
diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py
index 0267c733..1ffb4f7b 100644
--- a/mamweb/settings_prod.py
+++ b/mamweb/settings_prod.py
@@ -60,20 +60,8 @@ CSRF_COOKIE_SECURE = True
 
 
 
-# LOGGING = {
-#     'version': 1,
-#     'disable_existing_loggers': True,
-#     'handlers': {
-#         'console': {
-#             'class': 'logging.StreamHandler',
-#         },
-#     },
-#     'loggers': {
-#         'django': {
-#             'handlers': ['console'],
-#             'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
-#         },
-#     },
-# }
+# LOGGING 
+
+LOGGING['loggers']['']['handlers'].extend('mail_admins')
 
 
diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py
index 8f18bb5d..d7cbcd2d 100644
--- a/mamweb/settings_test.py
+++ b/mamweb/settings_test.py
@@ -50,7 +50,6 @@ import os
 SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz'
 ADMINS = [
     ('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'),
-    ('Tomas Gavenciak', 'gavento@gmail.com'),
 ]
 
 
@@ -59,5 +58,8 @@ ADMINS = [
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
 
+# LOGGING
+
+LOGGING['loggers']['']['handlers'].extend('mail_admins')