From b53214e30b1fb19336b77a19982c84c2dc5dce7f Mon Sep 17 00:00:00 2001 From: yuyafei Date: Thu, 7 Jul 2016 18:27:21 +0800 Subject: [PATCH] Correct reraising of exception When an exception was caught and rethrown, it should call 'raise' without any arguments because it shows the place where an exception occured initially instead of place where the exception re-raised. Change-Id: I326dd8eaf221cbf3729beedaff81b416c59ae2e6 --- swift/common/manager.py | 2 +- swift/common/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)