openstack/keystone
Code Issues Proposed changes

Merge "Add _FATAL_EXCEPTION_FORMAT_ERRORS global."

Browse Source
This commit is contained in:
Jenkins 2013-01-14 17:56:54 +00:00 committed by Gerrit Code Review
commit 08a6859328
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keystone/exception.py
View File

@ -22,6 +22,9 @@ from keystone import config
CONF = config.CONF
LOG = logging.getLogger(__name__)
# Tests use this to make exception message format errors fatal
_FATAL_EXCEPTION_FORMAT_ERRORS = False
class Error(StandardError):
"""Base error class.
@ -37,10 +40,13 @@ class Error(StandardError):
try:
message = self._build_message(message, **kwargs)
except KeyError:
except KeyError as e:
# if you see this warning in your logs, please raise a bug report
LOG.warning('missing expected exception kwargs (programmer error)')
message = self.__doc__
if _FATAL_EXCEPTION_FORMAT_ERRORS:
raise e
else:
LOG.warning('missing exception kwargs (programmer error)')
message = self.__doc__
super(Error, self).__init__(message)