openstack/trove
Code Issues Proposed changes

Merge "Change reporting of unhandled logging"

Browse Source
This commit is contained in:
Jenkins
2015-12-02 00:22:57 +00:00
committed by Gerrit Code Review
parent d2a4f3e6cb 67adc87e92
commit f66701218b
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
trove/tests/root_logger.py
View File

@@ -22,15 +22,17 @@ class DefaultRootHandler(logging.StreamHandler):
__handler = logging.StreamHandler() __handler = logging.StreamHandler()
__singleton = None __singleton = None
__info = None __info = None
__enable_backtrace = False
@classmethod @classmethod
def activate(cls): def activate(cls, enable_backtrace=False):
# leverage the singleton __handler which has an # leverage the singleton __handler which has an
# acquire() method to create a critical section. # acquire() method to create a critical section.
cls.__handler.acquire() cls.__handler.acquire()
if cls.__singleton is None: if cls.__singleton is None:
cls.__singleton = DefaultRootHandler() cls.__singleton = DefaultRootHandler()
cls.__enable_backtrace = enable_backtrace
cls.__handler.release() cls.__handler.release()
return cls.__singleton return cls.__singleton
@@ -47,21 +49,26 @@ class DefaultRootHandler(logging.StreamHandler):
super(DefaultRootHandler, self).__init__() super(DefaultRootHandler, self).__init__()
def emit(self, record): def emit(self, record):
msg = ("[" + record.name + "]\n" + if DefaultRootHandler.__info:
self.format(record) + "\n" + msg = ("*************************\n" +
(("\tFrom: " + DefaultRootHandler.__info + "\n") "Unhandled message logged from " +
if DefaultRootHandler.__info DefaultRootHandler.__info + ", " +
else (''.join(traceback.format_stack())))) record.name + "\n")
self.stream.write(msg)
self.flush() if DefaultRootHandler.__enable_backtrace:
msg += ''.join(traceback.format_stack()) + "\n"
msg += "*************************\n"
self.stream.write(msg)
self.flush()
class DefaultRootLogger(object): class DefaultRootLogger(object):
"""A root logger that uses the singleton handler""" """A root logger that uses the singleton handler"""
def __init__(self): def __init__(self, enable_backtrace=False):
super(DefaultRootLogger, self).__init__() super(DefaultRootLogger, self).__init__()
handler = DefaultRootHandler.activate() handler = DefaultRootHandler.activate(enable_backtrace=False)
handler.acquire() handler.acquire()
if handler not in logging.getLogger('').handlers: if handler not in logging.getLogger('').handlers:

2
trove/tests/unittests/trove_testtools.py
View File

@@ -44,7 +44,7 @@ class TestCase(testtools.TestCase):
'TROVE_TESTS_UNMOCK_ONLY_UNIQUE', True)) 'TROVE_TESTS_UNMOCK_ONLY_UNIQUE', True))
cls._dangling_mocks = set() cls._dangling_mocks = set()
root_logger.DefaultRootLogger() root_logger.DefaultRootLogger(enable_backtrace=False)
@classmethod @classmethod
def is_bool(cls, val): def is_bool(cls, val):