diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 04:31:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 04:31:44 +0000 |
| commit | b7a0a193f5ee5d9ad55f0c8a8d7b7da9692dbffb (patch) | |
| tree | 9440d49bc2614c715fed0a34a90798a4b1a48e29 /nova/utils.py | |
| parent | 08499b9c2d6aa9c4f416afc5672dcf474fca0fbb (diff) | |
| parent | 9deabd21f49cd986b642d5f3718d6285da83e8bb (diff) | |
| download | nova-b7a0a193f5ee5d9ad55f0c8a8d7b7da9692dbffb.tar.gz nova-b7a0a193f5ee5d9ad55f0c8a8d7b7da9692dbffb.tar.xz nova-b7a0a193f5ee5d9ad55f0c8a8d7b7da9692dbffb.zip | |
Merge "Default value of monkey_patch_modules is broken"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nova/utils.py b/nova/utils.py index fb56df05c..3e194fc57 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -50,14 +50,16 @@ from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils +notify_decorator = 'nova.openstack.common.notifier.api.notify_decorator' + monkey_patch_opts = [ cfg.BoolOpt('monkey_patch', default=False, help='Whether to log monkey patching'), cfg.ListOpt('monkey_patch_modules', default=[ - 'nova.api.ec2.cloud:nova.notifier.api.notify_decorator', - 'nova.compute.api:nova.notifier.api.notify_decorator' + 'nova.api.ec2.cloud:%s' % (notify_decorator), + 'nova.compute.api:%s' % (notify_decorator) ], help='List of modules/decorators to monkey patch'), ] @@ -920,10 +922,11 @@ def monkey_patch(): You can set decorators for each modules using CONF.monkey_patch_modules. The format is "Module path:Decorator function". - Example: 'nova.api.ec2.cloud:nova.notifier.api.notify_decorator' + Example: + 'nova.api.ec2.cloud:nova.openstack.common.notifier.api.notify_decorator' Parameters of the decorator is as follows. - (See nova.notifier.api.notify_decorator) + (See nova.openstack.common.notifier.api.notify_decorator) name - name of the function function - object of the function |