commit e437cf48d1c89796174559d3db4861f61a0bc661
author Sapan Bhatia <sapan@opennetworking.org> Mon Aug 21 22:41:29 2017 -0400
committer Sapan Bhatia <sapan@opennetworking.org> Tue Aug 22 17:50:48 2017 -0400
tree 1be3e13aec5a8c243b0f35d500a2ed2c2a1c97c6
parent 74cd1e48fa0e5207940cdec4556d9eb0d358c47b

CORD-1743: Some unit tests + fixed config bugs

Change-Id: I1e8c95334184662f245572d0d2cd1431b8bada9d

multistructlog.py

diff --git a/multistructlog.py b/multistructlog.py
index 8896cf2..b4aa19b 100644
--- a/multistructlog.py
+++ b/multistructlog.py
@@ -43,13 +43,11 @@
 import sys
 import copy
 
-
 PROCESSOR_MAP = {
     'StreamHandler': structlog.dev.ConsoleRenderer(),
     'LogstashHandler': structlog.processors.JSONRenderer(),
 }
 
-
 class FormatterFactory:
     def __init__(self, handler_name):
         self.handler_name = handler_name
@@ -66,13 +64,9 @@
 
 
 class XOSLoggerFactory:
-    def __init__(self, handlers):
-        self.handlers = handlers
-
     def __call__(self):
         base_logger = logging.getLogger()
-        base_logger.handlers = []
-        for h in self.handlers:
+        for h in base_logger.handlers:
             formatter = FormatterFactory(h.__class__.__name__)()
             h.setFormatter(formatter)
             base_logger.addHandler(h)
@@ -101,7 +95,7 @@
 
     """Inherit base options from config"""
     try:
-        logging_config = copy.deepcopy(_config.get('logging'))
+        logging_config = copy.deepcopy(_config)
     except AttributeError:
         first_entry_elts.append('Config is empty')
         logging_config = {}
@@ -128,7 +122,6 @@
         logstash.LogstashHandler('localhost', 5617, version=1)
     ]
 
-    handlers = logging_config.get('handlers', default_handlers)
     logging.config.dictConfig(logging_config)
 
     # Processors
@@ -140,7 +133,7 @@
         structlog.stdlib.ProcessorFormatter.wrap_for_formatter
     ])
 
-    factory = XOSLoggerFactory(handlers)
+    factory = XOSLoggerFactory()
 
     structlog.configure(
         processors=processors,