diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-21 19:57:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-21 19:57:38 +0000 |
| commit | efdaeb2f16cdd96c0742afb0f776878e39fabf5b (patch) | |
| tree | 0f3f000264b9b2c607aead77949ba5bd64c5073c /nova/api | |
| parent | 6a16ebd2ac1259c7dbde3be8db5679f24070ed5c (diff) | |
| parent | 699ef28045cd2da319859d24faba4d91e094be24 (diff) | |
| download | nova-efdaeb2f16cdd96c0742afb0f776878e39fabf5b.tar.gz nova-efdaeb2f16cdd96c0742afb0f776878e39fabf5b.tar.xz nova-efdaeb2f16cdd96c0742afb0f776878e39fabf5b.zip | |
Merge "Minor HACKING.rst exception fix"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index cfbb0894f..c3022e546 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1138,8 +1138,9 @@ class CloudController(object): except exception.NoFloatingIpInterface: msg = _('l3driver call to add floating ip failed.') raise exception.EC2APIError(msg) - except: + except Exception: msg = _('Error, unable to associate floating ip.') + LOG.exception(msg) raise exception.EC2APIError(msg) def disassociate_address(self, context, public_ip, **kwargs): diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index a3dac71ae..0b7fa881e 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -253,8 +253,9 @@ class FloatingIPActionController(wsgi.Controller): except exception.NoFloatingIpInterface: msg = _('l3driver call to add floating ip failed') raise webob.exc.HTTPBadRequest(explanation=msg) - except: + except Exception: msg = _('Error. Unable to associate floating ip') + LOG.exception(msg) raise webob.exc.HTTPBadRequest(explanation=msg) return webob.Response(status_int=202) |