From 8d84e8b4a25d493b704912df22dc080639f5201a Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Wed, 31 Jan 2018 11:51:47 -0500
Subject: [PATCH] Consolidate overrides into base config.

They used to be in a conditional but aren't anymore so we don't need to have
them be separate.
---
 openedx/core/lib/logsettings.py | 43 +++++++++++++++------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/openedx/core/lib/logsettings.py b/openedx/core/lib/logsettings.py
index 3385a67d9b..4800ff3f7f 100644
--- a/openedx/core/lib/logsettings.py
+++ b/openedx/core/lib/logsettings.py
@@ -65,6 +65,20 @@ def get_logger_config(log_dir,
                 'filters': ['require_debug_false'],
                 'class': 'django.utils.log.AdminEmailHandler'
             },
+            'local': {
+                'level': local_loglevel,
+                'class': 'logging.handlers.SysLogHandler',
+                'address': '/dev/log',
+                'formatter': 'syslog_format',
+                'facility': SysLogHandler.LOG_LOCAL0,
+            },
+            'tracking': {
+                'level': 'DEBUG',
+                'class': 'logging.handlers.SysLogHandler',
+                'address': '/dev/log',
+                'facility': SysLogHandler.LOG_LOCAL1,
+                'formatter': 'raw',
+            },
         },
         'loggers': {
             'tracking': {
@@ -74,7 +88,7 @@ def get_logger_config(log_dir,
             },
             '': {
                 'handlers': handlers,
-                'level': 'DEBUG',
+                'level': 'INFO',
                 'propagate': False
             },
             'django.request': {
@@ -82,31 +96,14 @@ def get_logger_config(log_dir,
                 'level': 'ERROR',
                 'propagate': True,
             },
+            # requests is so loud at INFO (logs every connection) that we
+            # force it to warn in production environments
+            'requests.packages.urllib3': {
+                'level': 'WARN'
+            }
         }
     }
 
-    # for production environments we will only
-    # log INFO and up
-    logger_config['loggers']['']['level'] = 'INFO'
-    # requests is so loud at INFO (logs every connection) that we force it to warn in production environments
-    logger_config['loggers']['requests.packages.urllib3'] = {'level': 'WARN'}
-    logger_config['handlers'].update({
-        'local': {
-            'level': local_loglevel,
-            'class': 'logging.handlers.SysLogHandler',
-            'address': '/dev/log',
-            'formatter': 'syslog_format',
-            'facility': SysLogHandler.LOG_LOCAL0,
-        },
-        'tracking': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.SysLogHandler',
-            'address': '/dev/log',
-            'facility': SysLogHandler.LOG_LOCAL1,
-            'formatter': 'raw',
-        },
-    })
-
     return logger_config