From a0f968235332e5400d507bbafa99bc0728aa8479 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Tue, 28 Jun 2011 21:04:50 -0700 Subject: moved to wrap_exception decorator --- nova/exception.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'nova/exception.py') diff --git a/nova/exception.py b/nova/exception.py index f3a452228..4b625dd04 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -81,11 +81,17 @@ def wrap_db_error(f): _wrap.func_name = f.func_name -def wrap_exception(f): +def wrap_exception(f, notifier=None, publisher_id=None, level=None): def _wrap(*args, **kw): try: return f(*args, **kw) except Exception, e: + if notifier != None and 'safe_notify' in notifier.dir(): + event_type = f.__name__ + payload = dict(args=args, exception=e) + payload.update(kw) + notifier.safe_notify(publisher_id, event_type, level, payload) + if not isinstance(e, Error): #exc_type, exc_value, exc_traceback = sys.exc_info() LOG.exception(_('Uncaught exception')) -- cgit From 8bd200505ada97780d3a63927cfadcded456b30d Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Wed, 29 Jun 2011 08:14:43 -0700 Subject: moved to wrap_exception approach --- nova/exception.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/exception.py') diff --git a/nova/exception.py b/nova/exception.py index 4b625dd04..fb2094c04 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -25,6 +25,7 @@ SHOULD include dedicated exception logging. """ from nova import log as logging +from nova.notifier import api as notifier LOG = logging.getLogger('nova.exception') @@ -81,13 +82,12 @@ def wrap_db_error(f): _wrap.func_name = f.func_name -def wrap_exception(f, notifier=None, publisher_id=None, level=None): +def wrap_exception(f, event_type=None, publisher_id=None, level=notifier.ERROR): def _wrap(*args, **kw): try: return f(*args, **kw) except Exception, e: - if notifier != None and 'safe_notify' in notifier.dir(): - event_type = f.__name__ + if event_type and publisher_id: payload = dict(args=args, exception=e) payload.update(kw) notifier.safe_notify(publisher_id, event_type, level, payload) -- cgit From 799919fe59d4a4faed1ce4effd9705173671e4da Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Wed, 29 Jun 2011 19:10:11 -0700 Subject: done and done --- nova/exception.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/exception.py') diff --git a/nova/exception.py b/nova/exception.py index c6d2bbc3d..ea590199c 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -82,7 +82,8 @@ def wrap_db_error(f): _wrap.func_name = f.func_name -def wrap_exception(notifier=None, publisher_id=None, event_type=None, level=None): +def wrap_exception(notifier=None, publisher_id=None, event_type=None, + level=None): """This decorator wraps a method to catch any exceptions that may get thrown. It logs the exception as well as optionally sending it to the notification system. -- cgit From e789dd29c48ee8ad2b10eeb9ff24725f0e696bed Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Fri, 1 Jul 2011 07:31:17 -0700 Subject: review fixes --- nova/exception.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/exception.py') diff --git a/nova/exception.py b/nova/exception.py index ea590199c..6e277b68d 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -113,8 +113,8 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None, # propagated. temp_type = f.__name__ - notifier.safe_notify(publisher_id, temp_type, temp_level, - payload) + notifier.notify(publisher_id, temp_type, temp_level, + payload) if not isinstance(e, Error): #exc_type, exc_value, exc_traceback = sys.exc_info() -- cgit From e6ebcbd911467ed1a9a468a350c5488ac83811bd Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Mon, 11 Jul 2011 07:49:34 -0700 Subject: pre trunk merge --- nova/exception.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nova/exception.py') diff --git a/nova/exception.py b/nova/exception.py index a6776b64f..988940d6a 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -377,6 +377,10 @@ class FixedIpNotFoundForInstance(FixedIpNotFound): message = _("Instance %(instance_id)s has zero fixed ips.") +class FixedIpNotFoundForSpecificInstance(FixedIpNotFound): + message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.") + + class FixedIpNotFoundForVirtualInterface(FixedIpNotFound): message = _("Virtual interface %(vif_id)s has zero associated fixed ips.") -- cgit