diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-06 16:34:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-06 16:34:35 +0000 |
| commit | d460ebd3dbc8fbcf912e0fb8935a124976c2f234 (patch) | |
| tree | 4717321c612a27464dff2ce75df6181cd0fbbf26 /openstack/common/notifier/api.py | |
| parent | ddbb9e18c1f9b6492a2b05160da3ccdedb4aedce (diff) | |
| parent | d9e28ba02c30255511a56a59e93da283c172dffe (diff) | |
| download | oslo-d460ebd3dbc8fbcf912e0fb8935a124976c2f234.tar.gz oslo-d460ebd3dbc8fbcf912e0fb8935a124976c2f234.tar.xz oslo-d460ebd3dbc8fbcf912e0fb8935a124976c2f234.zip | |
Merge "Move get_context_from_function_and_args() to context.py"
Diffstat (limited to 'openstack/common/notifier/api.py')
| -rw-r--r-- | openstack/common/notifier/api.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py index 6a46cd2..45af4ed 100644 --- a/openstack/common/notifier/api.py +++ b/openstack/common/notifier/api.py @@ -17,12 +17,11 @@ import inspect import uuid from openstack.common import cfg -from openstack.common import exception +from openstack.common import context from openstack.common import importutils from openstack.common import jsonutils from openstack.common import log as logging from openstack.common import timeutils -from openstack.common import utils LOG = logging.getLogger(__name__) @@ -72,8 +71,8 @@ def notify_decorator(name, fn): for key in kwarg: body['kwarg'][key] = kwarg[key] - context = exception.get_context_from_function_and_args(fn, args, kwarg) - notify(context, + ctxt = context.get_context_from_function_and_args(fn, args, kwarg) + notify(ctxt, CONF.default_publisher_id, name, CONF.default_notification_level, |