diff options
Diffstat (limited to 'openstack/common/notifier')
| -rw-r--r-- | openstack/common/notifier/api.py | 16 | ||||
| -rw-r--r-- | openstack/common/notifier/list_notifier.py | 7 | ||||
| -rw-r--r-- | openstack/common/notifier/log_notifier.py | 4 | ||||
| -rw-r--r-- | openstack/common/notifier/rabbit_notifier.py | 6 |
4 files changed, 17 insertions, 16 deletions
diff --git a/openstack/common/notifier/api.py b/openstack/common/notifier/api.py index f01d11e..e699620 100644 --- a/openstack/common/notifier/api.py +++ b/openstack/common/notifier/api.py @@ -37,7 +37,7 @@ notifier_opts = [ cfg.StrOpt('default_publisher_id', default='$host', help='Default publisher_id for outgoing notifications'), - ] +] CONF = cfg.CONF CONF.register_opts(notifier_opts) @@ -122,21 +122,21 @@ def notify(context, publisher_id, event_type, priority, payload): """ if priority not in log_levels: raise BadPriorityException( - _('%s not in valid priorities') % priority) + _('%s not in valid priorities') % priority) # Ensure everything is JSON serializable. payload = jsonutils.to_primitive(payload, convert_instances=True) driver = importutils.import_module(CONF.notification_driver) msg = dict(message_id=str(uuid.uuid4()), - publisher_id=publisher_id, - event_type=event_type, - priority=priority, - payload=payload, - timestamp=str(timeutils.utcnow())) + publisher_id=publisher_id, + event_type=event_type, + priority=priority, + payload=payload, + timestamp=str(timeutils.utcnow())) try: driver.notify(context, msg) except Exception, e: LOG.exception(_("Problem '%(e)s' attempting to " "send to notification system. Payload=%(payload)s") % - locals()) + locals()) diff --git a/openstack/common/notifier/list_notifier.py b/openstack/common/notifier/list_notifier.py index 41549df..15ae470 100644 --- a/openstack/common/notifier/list_notifier.py +++ b/openstack/common/notifier/list_notifier.py @@ -19,9 +19,10 @@ from openstack.common import importutils from openstack.common import log as logging -list_notifier_drivers_opt = cfg.MultiStrOpt('list_notifier_drivers', - default=['openstack.common.notifier.no_op_notifier'], - help='List of drivers to send notifications') +list_notifier_drivers_opt = cfg.MultiStrOpt( + 'list_notifier_drivers', + default=['openstack.common.notifier.no_op_notifier'], + help='List of drivers to send notifications') CONF = cfg.CONF CONF.register_opt(list_notifier_drivers_opt) diff --git a/openstack/common/notifier/log_notifier.py b/openstack/common/notifier/log_notifier.py index 9ef3118..b333d7a 100644 --- a/openstack/common/notifier/log_notifier.py +++ b/openstack/common/notifier/log_notifier.py @@ -30,6 +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/notifier/rabbit_notifier.py b/openstack/common/notifier/rabbit_notifier.py index 69ca8bd..3a2ffee 100644 --- a/openstack/common/notifier/rabbit_notifier.py +++ b/openstack/common/notifier/rabbit_notifier.py @@ -22,9 +22,9 @@ from openstack.common import rpc LOG = logging.getLogger(__name__) -notification_topic_opt = cfg.ListOpt('notification_topics', - default=['notifications', ], - help='AMQP topic used for openstack notifications') +notification_topic_opt = cfg.ListOpt( + 'notification_topics', default=['notifications', ], + help='AMQP topic used for openstack notifications') CONF = cfg.CONF CONF.register_opt(notification_topic_opt) |