Correct swift reraising of exception

Code Issues Proposed changes

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

This commit is contained in:

gengchc2

2016年08月26日 14:08:08 +08:00

parent 01477c78c1

commit 671254224a

2 changed files with 2 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/x_profile/html_viewer.py

View File

@@ -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)

2
swift/container/sync.py

View File

@@ -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,