diff options
| -rw-r--r-- | openstack/common/notifier/log_notifier.py | 3 | ||||
| -rw-r--r-- | openstack/common/rpc/__init__.py | 4 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/openstack/common/notifier/log_notifier.py b/openstack/common/notifier/log_notifier.py index 3b025f0..9ef3118 100644 --- a/openstack/common/notifier/log_notifier.py +++ b/openstack/common/notifier/log_notifier.py @@ -30,5 +30,6 @@ def notify(_context, message): CONF.default_notification_level) priority = priority.lower() logger = logging.getLogger( - 'openstack.common.notification.%s' % message['event_type']) + 'openstack.common.notification.%s' % + message['event_type']) getattr(logger, priority)(jsonutils.dumps(message)) diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index 473268d..f9e44c7 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -47,7 +47,9 @@ rpc_opts = [ help='Seconds to wait before a cast expires (TTL). ' 'Only supported by impl_zmq.'), cfg.ListOpt('allowed_rpc_exception_modules', - default=['openstack.common.exception', 'nova.exception'], + default=['openstack.common.exception', + 'nova.exception', + ], help='Modules of exceptions that are permitted to be recreated' 'upon receiving exception data from an rpc call.'), cfg.StrOpt('control_exchange', diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index 77723ca..bbdb40f 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -47,9 +47,12 @@ zmq_opts = [ 'address.'), # The module.Class to use for matchmaking. - cfg.StrOpt('rpc_zmq_matchmaker', - default='openstack.common.rpc.matchmaker.MatchMakerLocalhost', - help='MatchMaker driver'), + cfg.StrOpt( + 'rpc_zmq_matchmaker', + default=('openstack.common.rpc' + 'matchmaker.MatchMakerLocalhost'), + help='MatchMaker driver', + ), # The following port is unassigned by IANA as of 2012-05-21 cfg.IntOpt('rpc_zmq_port', default=9501, |