openstack/swift
Code Issues Proposed changes

Fix duplicate logging

Browse Source
This commit is contained in:
gholt
2011-02-02 09:38:17 -08:00
parent f8c5986cb4
commit fdf20184e4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
swift/common/utils.py
View File

@@ -409,6 +409,7 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None):
logger = logging.getLogger() logger = logging.getLogger()
else: else:
logger = logging.getLogger(log_route) logger = logging.getLogger(log_route)
logger.propagate = False
if not hasattr(get_logger, 'handlers'): if not hasattr(get_logger, 'handlers'):
get_logger.handlers = {} get_logger.handlers = {}
facility = getattr(SysLogHandler, conf.get('log_facility', 'LOG_LOCAL0'), facility = getattr(SysLogHandler, conf.get('log_facility', 'LOG_LOCAL0'),

4
test/unit/common/test_daemon.py
View File

@@ -28,7 +28,7 @@ class MyDaemon(daemon.Daemon):
def __init__(self, conf): def __init__(self, conf):
self.conf = conf self.conf = conf
self.logger = utils.get_logger(None) self.logger = utils.get_logger(None, 'server')
MyDaemon.forever_called = False MyDaemon.forever_called = False
MyDaemon.once_called = False MyDaemon.once_called = False
@@ -97,7 +97,7 @@ user = %s
# test user quit # test user quit
MyDaemon.run_forever = MyDaemon.run_quit MyDaemon.run_forever = MyDaemon.run_quit
sio = StringIO() sio = StringIO()
logger = logging.getLogger() logger = logging.getLogger('server')
logger.addHandler(logging.StreamHandler(sio)) logger.addHandler(logging.StreamHandler(sio))
logger = utils.get_logger(None, 'server') logger = utils.get_logger(None, 'server')
daemon.run_daemon(MyDaemon, conf_file, logger=logger) daemon.run_daemon(MyDaemon, conf_file, logger=logger)

2
test/unit/common/test_utils.py
View File

@@ -287,7 +287,7 @@ Error: unable to locate %s
def test_get_logger(self): def test_get_logger(self):
sio = StringIO() sio = StringIO()
logger = logging.getLogger() logger = logging.getLogger('server')
logger.addHandler(logging.StreamHandler(sio)) logger.addHandler(logging.StreamHandler(sio))
logger = utils.get_logger(None, 'server') logger = utils.get_logger(None, 'server')
logger.warn('test1') logger.warn('test1')