summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-14 14:21:44 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-14 14:21:44 +0100
commit04838ee14d0ac6df0052fba465cdf7f765c66ae5 (patch)
treebbb4422e623d93da0a3c234cf75ef894934ee954 /nova/log.py
parentc8fc7ed48be84e3b39ab88c8c103fbe52b6718e1 (diff)
parent3fb5da952e041f88a29ad0b049c52236b84954e9 (diff)
downloadnova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.tar.gz
nova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.tar.xz
nova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.zip
Merge trunk
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/log.py b/nova/log.py
index 87a21ddb4..d194ab8f0 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -266,7 +266,10 @@ class NovaRootLogger(NovaLogger):
def handle_exception(type, value, tb):
- logging.root.critical(str(value), exc_info=(type, value, tb))
+ extra = {}
+ if FLAGS.verbose:
+ extra['exc_info'] = (type, value, tb)
+ logging.root.critical(str(value), **extra)
def reset():