From b207ba3ed30a4750eec60a44e4dba66c59491e7b Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Mon, 26 Mar 2012 09:41:10 -0400 Subject: Fix traceback when sending invalid data. Running euca-terminate-instance with invalid data results in a traceback and a hang. This fixes bug 965225 Change-Id: I0b547d527bca5fb86ff650188ac903066361d933 --- nova/api/ec2/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'nova/api') diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 17759015f..964f54995 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -634,11 +634,9 @@ class Executor(wsgi.Application): context=context) return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except exception.InvalidInstanceIDMalformed as ex: - LOG.debug(_('ValidatorError raised: %s'), unicode(ex), - context=context) - #EC2 Compatibility - return self._error(req, context, "InvalidInstanceID.Malformed", - unicode(ex)) + LOG.debug(_('Invalid id: bogus (expecting "i-..."): %s'), + unicode(ex), context=context) + return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except Exception as ex: env = req.environ.copy() for k in env.keys(): -- cgit