summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2010-12-29 18:46:36 -0600
committerTrey Morris <trey.morris@rackspace.com>2010-12-29 18:46:36 -0600
commit837724193ece16310ff588a84d23891a75ced2f2 (patch)
tree6acf6c34e35a900a4e06a0155550c2375a3b5cec
parentd06f85c611adf244f2c757f023c92c2b6cad2e7c (diff)
altered error exception/logging
-rw-r--r--nova/compute/api.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 19459c6d9..6602f2534 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -63,9 +63,11 @@ def checks_instance_lock(function):
instance_id = args[2]
locked = ComputeAPI().get_lock(context, instance_id)
admin = context.is_admin
- except:
+ except Excetion as e:
logging.error(_("check_instance_lock: arguments: |%s| |%s|"), args,
kwargs)
+ raise e
+
# if admin or unlocked call function, otherwise 405
if admin or not locked:
return function(*args, **kwargs)