summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-11-15 22:51:52 +0000
committerGerrit Code Review <review@openstack.org>2011-11-15 22:51:52 +0000
commit6ae372fc784005572f03d1d9ff43952b428f656a (patch)
treee47b52a5c927518f4c0582871a490891ac4b2c90 /nova/api
parentdd5c3f7badf24e21eb1b311639bcbc55512bc117 (diff)
parent01150b5d0d482a83a1065c2a6d62f4963c9f838d (diff)
downloadnova-6ae372fc784005572f03d1d9ff43952b428f656a.tar.gz
nova-6ae372fc784005572f03d1d9ff43952b428f656a.tar.xz
nova-6ae372fc784005572f03d1d9ff43952b428f656a.zip
Merge "Bug #886353: Faults raised by OpenStack API Resource handlers fail to be reported properly"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 7deba6382..1d1337626 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -567,6 +567,9 @@ class Resource(wsgi.Application):
try:
action_result = self.dispatch(request, action, args)
+ except faults.Fault as ex:
+ LOG.info(_("Fault thrown: %s"), unicode(ex))
+ action_result = ex
except webob.exc.HTTPException as ex:
LOG.info(_("HTTP exception thrown: %s"), unicode(ex))
action_result = faults.Fault(ex)