diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-02 16:42:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-02 16:42:39 +0000 |
| commit | 864e934cfa7003767dabb4f9a51ebe1e493f6027 (patch) | |
| tree | 8fb49329d235b3dfb19701a36348f73877c096fc /openstack/common/exception.py | |
| parent | ea160989ad2708e59ec77ce855e51d118d5edfb6 (diff) | |
| parent | dc99baa33648820b93c90c15bd3562284e8ce4a9 (diff) | |
| download | oslo-864e934cfa7003767dabb4f9a51ebe1e493f6027.tar.gz oslo-864e934cfa7003767dabb4f9a51ebe1e493f6027.tar.xz oslo-864e934cfa7003767dabb4f9a51ebe1e493f6027.zip | |
Merge "Add _FATAL_EXCEPTION_FORMAT_ERRORS global."
Diffstat (limited to 'openstack/common/exception.py')
| -rw-r--r-- | openstack/common/exception.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/openstack/common/exception.py b/openstack/common/exception.py index fa06d6a..4a7c72b 100644 --- a/openstack/common/exception.py +++ b/openstack/common/exception.py @@ -23,6 +23,8 @@ import logging from openstack.common.gettextutils import _ +_FATAL_EXCEPTION_FORMAT_ERRORS = False + class Error(Exception): def __init__(self, message=None): @@ -121,9 +123,12 @@ class OpenstackException(Exception): try: self._error_string = self.message % kwargs - except Exception: - # at least get the core message out if something happened - self._error_string = self.message + except Exception as e: + if _FATAL_EXCEPTION_FORMAT_ERRORS: + raise e + else: + # at least get the core message out if something happened + self._error_string = self.message def __str__(self): return self._error_string |