Fix duplicate logging

swift/common/utils.py

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

test/unit/common/test_daemon.py

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

test/unit/common/test_utils.py

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