x/python-ganttclient
Code Issues Proposed changes

make api error messages more readable

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-09-10 16:40:49 -07:00
parent 52b0042e9b
commit 5955be2f27
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/endpoint/api.py
View File

@@ -304,7 +304,10 @@ class APIRequestHandler(tornado.web.RequestHandler):
try: try:
failure.raiseException() failure.raiseException()
except exception.ApiError as ex: except exception.ApiError as ex:
self._error(type(ex).__name__ + "." + ex.code, ex.message) if ex.code:
self._error(ex.code, ex.message)
else:
self._error(type(ex).__name__, ex.message)
# TODO(vish): do something more useful with unknown exceptions # TODO(vish): do something more useful with unknown exceptions
except Exception as ex: except Exception as ex:
self._error(type(ex).__name__, str(ex)) self._error(type(ex).__name__, str(ex))

2
nova/endpoint/cloud.py
View File

@@ -529,7 +529,7 @@ class CloudController(object):
context.project.id, min_instances) context.project.id, min_instances)
raise QuotaError("Instance quota exceeded. You can only " raise QuotaError("Instance quota exceeded. You can only "
"run %s more instances of this type." % "run %s more instances of this type." %
num_instances) num_instances, "InstanceLimitExceeded")
# make sure user can access the image # make sure user can access the image
# vpn image is private so it doesn't show up on lists # vpn image is private so it doesn't show up on lists
vpn = kwargs['image_id'] == FLAGS.vpn_image_id vpn = kwargs['image_id'] == FLAGS.vpn_image_id