summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-04-26 15:15:58 +0000
committerGerrit Code Review <review@openstack.org>2012-04-26 15:15:58 +0000
commit4a2132c0e00a948ba80fc9a99509cbc0a22d14c8 (patch)
treea82fc1b59687da11a6b56a28d51b626693a4d55d
parentd89fe1d5df2e99994fbacd6847042a5bc6fb52e5 (diff)
parent467b76b7a2081ffce0f1f0a52ba4d8cf7bbb53bd (diff)
Merge "Ensure all messages include instance."
-rw-r--r--nova/api/openstack/compute/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index ef7e29ac0..c4a76da49 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -877,7 +877,7 @@ class Controller(wsgi.Controller):
common.raise_http_conflict_for_instance_invalid_state(state_error,
'reboot')
except Exception, e:
- LOG.exception(_("Error in reboot %s"), e)
+ LOG.exception(_("Error in reboot %s"), e, instance=instance)
raise exc.HTTPUnprocessableEntity()
return webob.Response(status_int=202)