diff options
-rw-r--r-- | nova/api/openstack/compute/contrib/rescue.py | 2 | ||||
-rw-r--r-- | nova/api/openstack/extensions.py | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index c5fcd1442..143b59063 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -43,7 +43,6 @@ class RescueController(wsgi.Controller): raise exc.HTTPNotFound(msg) @wsgi.action('rescue') - @exts.wrap_errors def _rescue(self, req, id, body): """Rescue an instance.""" context = req.environ["nova.context"] @@ -68,7 +67,6 @@ class RescueController(wsgi.Controller): return {'adminPass': password} @wsgi.action('unrescue') - @exts.wrap_errors def _unrescue(self, req, id, body): """Unrescue an instance.""" context = req.environ["nova.context"] diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index b2cdacd1e..e7c806388 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -309,18 +309,6 @@ class ResourceExtension(object): self.inherits = inherits -def wrap_errors(fn): - """Ensure errors are not passed along.""" - def wrapped(*args, **kwargs): - try: - return fn(*args, **kwargs) - except webob.exc.HTTPException: - raise - except Exception: - raise webob.exc.HTTPInternalServerError() - return wrapped - - def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None): """Registers all standard API extensions.""" |