summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-01-07 15:49:12 -0600
committerEd Leafe <ed@leafe.com>2011-01-07 15:49:12 -0600
commit253652adb578aee227b95dec3a5f854cac51bf4b (patch)
tree10a7b34bfcac3683d8dbdd48f76bfd3e2c0720ec /nova/exception.py
parent5d9ad54cc38283d0b946779f4235f54370b12489 (diff)
parent0ed247f360f77f0a4a469a8d3b155ac5fcfa509c (diff)
downloadnova-253652adb578aee227b95dec3a5f854cac51bf4b.tar.gz
nova-253652adb578aee227b95dec3a5f854cac51bf4b.tar.xz
nova-253652adb578aee227b95dec3a5f854cac51bf4b.zip
merged trunk changes
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 52bf2a2a7..ecd814e5d 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -21,9 +21,8 @@ Nova base exception handling, including decorator for re-raising
Nova-type exceptions. SHOULD include dedicated exception logging.
"""
-import logging
-import sys
-import traceback
+from nova import log as logging
+LOG = logging.getLogger('nova.exception')
class ProcessExecutionError(IOError):
@@ -88,7 +87,7 @@ def wrap_exception(f):
except Exception, e:
if not isinstance(e, Error):
#exc_type, exc_value, exc_traceback = sys.exc_info()
- logging.exception(_('Uncaught exception'))
+ LOG.exception(_('Uncaught exception'))
#logging.error(traceback.extract_stack(exc_traceback))
raise Error(str(e))
raise