summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-04-05 21:26:10 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-04-06 15:07:43 +0000
commit2fde2294d8fcf536acf640f5840c4e551b9dd433 (patch)
tree98100d42a79a5799c711fb08cc7f20045e05d780 /nova/utils.py
parent7a51a3f9626fe1135a85c77cb9d2a3a119783474 (diff)
downloadnova-2fde2294d8fcf536acf640f5840c4e551b9dd433.tar.gz
nova-2fde2294d8fcf536acf640f5840c4e551b9dd433.tar.xz
nova-2fde2294d8fcf536acf640f5840c4e551b9dd433.zip
Cleanup xenapi driver logging messages to include instance
Also, use the logging instance kwarg so it gets logged in a consistent format. Change-Id: I4429e9660ff72e1f79d889f89b5abbf1949720de
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 8119861c6..65d0c6829 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1715,7 +1715,7 @@ class UndoManager(object):
for undo_func in reversed(self.undo_stack):
undo_func()
- def rollback_and_reraise(self, msg=None):
+ def rollback_and_reraise(self, msg=None, **kwargs):
"""Rollback a series of actions then re-raise the exception.
.. note:: (sirp) This should only be called within an
@@ -1723,6 +1723,6 @@ class UndoManager(object):
"""
with save_and_reraise_exception():
if msg:
- LOG.exception(msg)
+ LOG.exception(msg, **kwargs)
self._rollback()