diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
| commit | be54e37bbd79293ce41f8fa8dfe40022aebb6fff (patch) | |
| tree | 8a46ee357f8fec2647bc9839c63b2053db343758 /nova | |
| parent | 8e0fd37ddfbe88df296cf45583f0b3e4fa4d7a75 (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (diff) | |
| download | nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.gz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.xz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.zip | |
Merged with trunk and fixed conflict. Sigh.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/log.py | 5 |
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(): |