From 669e31c68ed8b0fffeb88c0a47d2ae988262eee2 Mon Sep 17 00:00:00 2001
From: John Jarvis <john@jarv.org>
Date: Fri, 1 Aug 2014 13:55:15 -0400
Subject: [PATCH 1/2] allow rsyslog to be none

---
 common/lib/logsettings.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/lib/logsettings.py b/common/lib/logsettings.py
index 51743cab47..c567505efb 100644
--- a/common/lib/logsettings.py
+++ b/common/lib/logsettings.py
@@ -84,12 +84,6 @@ def get_logger_config(log_dir,
                 'filters': ['require_debug_false'],
                 'class': 'django.utils.log.AdminEmailHandler'
             },
-            'syslogger-remote': {
-                'level': 'INFO',
-                'class': 'logging.handlers.SysLogHandler',
-                'address': syslog_addr,
-                'formatter': 'syslog_format',
-            },
             'newrelic': {
                 'level': 'ERROR',
                 'class': 'lms.lib.newrelic_logging.NewRelicHandler',
@@ -114,6 +108,15 @@ def get_logger_config(log_dir,
             },
         }
     }
+    if syslog_addr:
+        logger_config['handlers'].update({
+            'syslogger-remote': {
+                'level': 'INFO',
+                'class': 'logging.handlers.SysLogHandler',
+                'address': syslog_addr,
+                'formatter': 'syslog_format',
+            },
+        })
 
     if dev_env:
         tracking_file_loc = os.path.join(log_dir, tracking_filename)

From 453528f99975d0cabcae7fcd7ac84f24b4699fbc Mon Sep 17 00:00:00 2001
From: John Jarvis <john@jarv.org>
Date: Mon, 4 Aug 2014 11:36:52 -0400
Subject: [PATCH 2/2] updating handlers list to conditionally include
 syslogger-remote

---
 common/lib/logsettings.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/logsettings.py b/common/lib/logsettings.py
index c567505efb..05b2d4f0cd 100644
--- a/common/lib/logsettings.py
+++ b/common/lib/logsettings.py
@@ -53,8 +53,9 @@ def get_logger_config(log_dir,
                                              logging_env=logging_env,
                                              hostname=hostname)
 
-    handlers = ['console', 'local'] if debug else ['console',
-                                                   'syslogger-remote', 'local']
+    handlers = ['console', 'local']
+    if syslog_addr:
+        handlers.append('syslogger-remote')
 
     logger_config = {
         'version': 1,