openstack/zun
Code Issues Proposed changes

Merge "Correct higgins reraising of exception"

Browse Source
This commit is contained in:
Jenkins 2016-09-11 17:15:37 +00:00 committed by Gerrit Code Review
commit 47f3581d2b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zun/common/exception.py
View File

@ -192,17 +192,17 @@ class ZunException(Exception):
try: try:
self.message = self.message % kwargs self.message = self.message % kwargs
except Exception as e: except KeyError:
# kwargs doesn't match a variable in the message # kwargs doesn't match a variable in the message
# log the issue and the kwargs # log the issue and the kwargs
LOG.exception(_LE('Exception in string format operation, ' LOG.exception(_LE('Exception in string format operation, '
'kwargs: %s') % kwargs) 'kwargs: %s') % kwargs)
try: try:
if CONF.fatal_exception_format_errors: ferr = CONF.fatal_exception_format_errors
raise e
except cfg.NoSuchOptError: except cfg.NoSuchOptError:
if CONF.oslo_versionedobjects.fatal_exception_format_errors: ferr = CONF.oslo_versionedobjects.fatal_exception_format_errors
raise e if ferr:
raise
super(ZunException, self).__init__(self.message) super(ZunException, self).__init__(self.message)