summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-14 12:36:46 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-14 12:36:46 -0400
commite9f6e47a92090a9a7867c2a117ae6cf58db394ac (patch)
tree0675c87825c8a31086814394bbc4d4095e9f6749 /nova/api
parent9806dacb03023d1db22e9cf833845ba8498657a3 (diff)
Improved errors
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index affc781dc..0b749e115 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -76,7 +76,8 @@ class JSONDeserializer(TextDeserializer):
try:
return utils.loads(datastring)
except ValueError:
- raise exception.MalformedRequestBody()
+ raise exception.MalformedRequestBody(
+ "malformed JSON in request body")
class XMLDeserializer(TextDeserializer):
@@ -96,7 +97,8 @@ class XMLDeserializer(TextDeserializer):
node = minidom.parseString(datastring).childNodes[0]
return {node.nodeName: self._from_xml_node(node, plurals)}
except ExpatError:
- raise exception.MalformedRequestBody()
+ raise exception.MalformedRequestBody(
+ "malformed XML in request Body")
def _from_xml_node(self, node, listnames):
"""Convert a minidom node to a simple Python type.
@@ -363,7 +365,7 @@ class Resource(wsgi.Application):
except exception.InvalidContentType:
return webob.exc.HTTPBadRequest(_("Unsupported Content-Type"))
except exception.MalformedRequestBody:
- explanation = _("Malformed request")
+ explanation = _("Malformed request body")
return faults.Fault(webob.exc.HTTPBadRequest(
explanation=explanation))