From 671254224a4a4710e7556535ee68bd999536ab8d Mon Sep 17 00:00:00 2001 From: gengchc2 Date: Fri, 26 Aug 2016 14:08:08 +0800 Subject: [PATCH] Correct swift 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: I783a2a65f3e38a23ba49b6ae5a2f56a5fdaac2fc --- swift/common/middleware/x_profile/html_viewer.py | 4 ++-- swift/container/sync.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/swift/common/middleware/x_profile/html_viewer.py b/swift/common/middleware/x_profile/html_viewer.py index 1132c6aa59..85426a93c0 100644 --- a/swift/common/middleware/x_profile/html_viewer.py +++ b/swift/common/middleware/x_profile/html_viewer.py @@ -386,8 +386,8 @@ class HTMLViewer(object): else: data = stats.print_stats() return data, [('content-type', self.format_dict[output_format])] - except ODFLIBNotInstalled as ex: - raise ex + except ODFLIBNotInstalled: + raise except Exception as ex: raise ProfileException(_('Data download error: %s') % ex) diff --git a/swift/container/sync.py b/swift/container/sync.py index 1c94d9a679..99df2e4be2 100644 --- a/swift/container/sync.py +++ b/swift/container/sync.py @@ -429,8 +429,6 @@ class ContainerSync(Daemon): sync_stage_time = time() self.container_syncs += 1 self.logger.increment('syncs') - except Exception as ex: - raise ex finally: self.container_report(start_at, sync_stage_time, sync_point1,