Clean up internal logging

mathom · mathom · commit 09c8ad5fd683 · 2014-10-15T13:20:27.000-05:00
diff --git a/stackify/__init__.py b/stackify/__init__.py
@@ -28,7 +28,11 @@
     logging.NOTSET: 'NOTSET'
 }
 
-logging.basicConfig()
+class NullHandler(logging.Handler):
+    def emit(self, record):
+        pass
+
+logging.getLogger(__name__).addHandler(NullHandler())
 
 
 from stackify.application import ApiConfiguration
@@ -37,28 +41,26 @@
 from stackify.handler import StackifyHandler
 
 
-# TODO
-# holds our listeners, since more than one handler can service
-# the same listener
-__listener_cache = {}
-
-
-def getLogger(name=None, auto_shutdown=True, **kwargs):
+def getLogger(name=None, auto_shutdown=True, basic_config=True, **kwargs):
     '''
     Get a logger and attach a StackifyHandler if needed.
     '''
+    if basic_config:
+        logging.basicConfig()
+
     if not name:
         name = getCallerName(2)
 
     logger = logging.getLogger(name)
 
     if not [isinstance(x, StackifyHandler) for x in logger.handlers]:
-        logger = logging.getLogger(__name__)
-        logger.debug('Creating handler for logger %s', name)
+        internal_logger = logging.getLogger(__name__)
+        internal_logger.debug('Creating handler for logger %s', name)
         handler = StackifyHandler(**kwargs)
         logger.addHandler(handler)
 
         if auto_shutdown:
+            internal_logger.debug('Registering atexit callback')
             atexit.register(stopLogging, logger)
 
         if logger.getEffectiveLevel() == logging.NOTSET:
@@ -73,8 +75,8 @@ def stopLogging(logger):
     Shut down the StackifyHandler on a given logger. This will block
     and wait for the queue to finish uploading.
     '''
-    logger = logging.getLogger(__name__)
-    logger.debug('Shutting down all handlers')
+    internal_logger = logging.getLogger(__name__)
+    internal_logger.debug('Shutting down all handlers')
     for handler in getHandlers(logger):
         handler.listener.stop()
 
diff --git a/stackify/handler.py b/stackify/handler.py
@@ -28,6 +28,7 @@ class StackifyHandler(QueueHandler):
     def __init__(self, queue_=None, listener=None, **kwargs):
         if queue_ is None:
             queue_ = queue.Queue(QUEUE_SIZE)
+        logger = logging.getLogger(__name__)
 
         super(StackifyHandler, self).__init__(queue_)
 
@@ -40,10 +41,10 @@ def enqueue(self, record):
         '''
         Put a new record on the queue. If it's full, evict an item.
         '''
-        logger = logging.getLogger(__name__)
         try:
             self.queue.put_nowait(record)
         except queue.Full:
+            logger = logging.getLogger(__name__)
             logger.warn('StackifyHandler queue is full, evicting oldest record')
             self.queue.get_nowait()
             self.queue.put_nowait(record)
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -12,7 +12,6 @@
 
 from stackify.handler import StackifyHandler, StackifyListener
 from stackify.application import ApiConfiguration
-from stackify import internal_log
 
 import logging
 
@@ -26,7 +25,8 @@ def test_queue_full(self):
         '''The queue should evict when full'''
         q = queue.Queue(1)
         handler = StackifyHandler(queue_=q, listener=Mock())
-        internal_log.setLevel(logging.CRITICAL) # don't print warnings on overflow
+        # don't print warnings on overflow, so mute stackify logger
+        logging.getLogger('stackify').propagate = False
         handler.enqueue('test1')
         handler.enqueue('test2')
         handler.enqueue('test3')
@@ -45,6 +45,8 @@ def setUp(self):
             environment = 'test_environment',
             api_key = 'test_apikey',
             api_url = 'test_apiurl')
+        # don't print warnings on http crashes, so mute stackify logger
+        logging.getLogger('stackify').propagate = False
 
     @patch('stackify.handler.LogMsg')
     @patch('stackify.handler.StackifyListener.send_group')
