diff --git a/swift/common/manager.py b/swift/common/manager.py index a19ade2215..f04f2a3e4b 100644 --- a/swift/common/manager.py +++ b/swift/common/manager.py @@ -316,7 +316,7 @@ class Manager(object): except OSError as e: # PID died before kill_group can take action? if e.errno != errno.ESRCH: - raise e + raise else: print(_('Waited %(kill_wait)s seconds for %(server)s ' 'to die; giving up') % diff --git a/swift/common/utils.py b/swift/common/utils.py index d3ef5a7dcb..60036489b0 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -1727,7 +1727,7 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None, except socket.error as e: # Either /dev/log isn't a UNIX socket or it does not exist at all if e.errno not in [errno.ENOTSOCK, errno.ENOENT]: - raise e + raise handler = SysLogHandler(facility=facility) handler.setFormatter(formatter) logger.addHandler(handler)