x/gantt
Code Issues Proposed changes

Default value of monkey_patch_modules is broken

Browse Source 
The default value of monkey_patch_modules has not kept up with
the move of notifier to openstack.common

Without this change setting 'monkey_patch=True' in nova.conf
will cause runtime errors unless the monkey_patch_modules
is also specified pointing to the correct notifier

Change-Id: Ib22faa7404b09791799338de2edfe0ddcd662d5f
This commit is contained in:
Phil Day
2013-01-31 12:55:19 +00:00
parent 6bf43d5e48
commit ae3a080053
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/utils.py
View File

@@ -50,14 +50,16 @@ from nova.openstack.common import importutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
notify_decorator = 'nova.openstack.common.notifier.api.notify_decorator'
monkey_patch_opts = [ monkey_patch_opts = [
cfg.BoolOpt('monkey_patch', cfg.BoolOpt('monkey_patch',
default=False, default=False,
help='Whether to log monkey patching'), help='Whether to log monkey patching'),
cfg.ListOpt('monkey_patch_modules', cfg.ListOpt('monkey_patch_modules',
default=[ default=[
'nova.api.ec2.cloud:nova.notifier.api.notify_decorator', 'nova.api.ec2.cloud:%s' % (notify_decorator),
'nova.compute.api:nova.notifier.api.notify_decorator' 'nova.compute.api:%s' % (notify_decorator)
], ],
help='List of modules/decorators to monkey patch'), help='List of modules/decorators to monkey patch'),
] ]
@@ -930,10 +932,11 @@ def monkey_patch():
You can set decorators for each modules You can set decorators for each modules
using CONF.monkey_patch_modules. using CONF.monkey_patch_modules.
The format is "Module path:Decorator function". 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. 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 name - name of the function
function - object of the function function - object of the function