Merge pull request #179 from anmekin/fix/remove_custom_handler

Remove CustomSysLogHandler

2 files changed, 1 insertions, 14 deletions

diff --git a/omaha_server/omaha_server/settings_prod.py b/omaha_server/omaha_server/settings_prod.py
index 665bd43..d3a3e2e 100644
--- a/omaha_server/omaha_server/settings_prod.py
+++ b/omaha_server/omaha_server/settings_prod.py
@@ -103,7 +103,7 @@ LOGGING = {
 if SPLUNK_HOST and SPLUNK_PORT:
     LOGGING['handlers']['splunk'] = {
         'level': os.environ.get('SPLUNK_LOGGING_LEVEL', 'INFO'),
-        'class': 'omaha_server.utils.CustomSysLogHandler',
+        'class': 'logging.handlers.SysLogHandler',
         'formatter': 'splunk_format',
         'address': (SPLUNK_HOST, int(SPLUNK_PORT))
     }
diff --git a/omaha_server/omaha_server/utils.py b/omaha_server/omaha_server/utils.py
index cb0422c..59e0a6c 100644
--- a/omaha_server/omaha_server/utils.py
+++ b/omaha_server/omaha_server/utils.py
@@ -26,19 +26,6 @@ class is_private(object):
         return inner
 
 
-class CustomSysLogHandler(logging.handlers.SysLogHandler):
-    def emit(self, record):
-        msg = self.format(record) + '\000'
-        if type(msg) is unicode:
-            msg = msg.encode('utf-8')
-        try:
-            self.socket.sendto(msg, self.address)
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except:
-            self.handleError(record)
-
-
 def show_toolbar(request):
     """
     Default function to determine whether to show the toolbar on a given page.