From 59b759c5e546ddd84cad3e23c306ffb006121c4f Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Fri, 28 Sep 2018 08:53:13 -0500
Subject: [PATCH] Small update to xmpp alert code
---
gracedb/alerts/main.py | 4 ++--
gracedb/alerts/xmpp.py | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gracedb/alerts/main.py b/gracedb/alerts/main.py
index 4c468ec2a..be64aa04d 100644
--- a/gracedb/alerts/main.py
+++ b/gracedb/alerts/main.py
@@ -17,7 +17,7 @@ from events.permission_utils import is_external
from events.query import filter_for_labels
from events.shortcuts import is_event
from superevents.shortcuts import is_superevent
-from .xmpp import issue_xmpp_alert
+from .xmpp import issue_xmpp_alerts
# Set up logger
log = logging.getLogger(__name__)
@@ -102,7 +102,7 @@ def issue_alerts(event_or_superevent, alert_type, serialized_object,
# Send XMPP alert
if settings.SEND_XMPP_ALERTS:
- issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
+ issue_xmpp_alerts(event_or_superevent, alert_type, serialized_object,
serialized_parent=serialized_parent)
# Below here, we only do processing for email and phone alerts ------------
diff --git a/gracedb/alerts/xmpp.py b/gracedb/alerts/xmpp.py
index 584787f12..2b7f712ad 100644
--- a/gracedb/alerts/xmpp.py
+++ b/gracedb/alerts/xmpp.py
@@ -63,7 +63,7 @@ def get_xmpp_node_names(event_or_superevent):
return node_names
-def issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
+def issue_xmpp_alerts(event_or_superevent, alert_type, serialized_object,
serialized_parent=None):
"""
serialized_object should be a dict
@@ -98,7 +98,7 @@ def issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
msg = simplejson.dumps(lva_data)
# Log message for debugging
- logger.info("issue_xmpp_alert: sending message {msg} for {uid}" \
+ logger.info("issue_xmpp_alerts: sending message {msg} for {uid}" \
.format(msg=msg, uid=uid))
# Get manager ready for LVAlert Overseer (?)
@@ -114,7 +114,7 @@ def issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
message_id = sha1(node_name + msg).hexdigest()
# Log message
- logger.info(("issue_xmpp_alert: sending alert type {alert_type} "
+ logger.info(("issue_xmpp_alerts: sending alert type {alert_type} "
"with message {msg_id} for {uid} to {node}").format(
alert_type=alert_type, msg_id=message_id, uid=uid,
node=node_name))
@@ -129,7 +129,7 @@ def issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
# If not success, we need to do this the old way.
if not success:
- logger.critical(("issue_xmpp_alert: sending message with "
+ logger.critical(("issue_xmpp_alerts: sending message with "
"LVAlert Overseer failed, trying lvalert_send"))
# If not using LVAlert Overseer or if sending with overseer failed,
@@ -138,6 +138,6 @@ def issue_xmpp_alert(event_or_superevent, alert_type, serialized_object,
success, err = send_with_lvalert_send(node_name, msg, server)
if not success:
- logger.critical(("issue_xmpp_alert: error sending message "
- "with lvalert_send: {e}").format(e=err))
+ logger.critical(("issue_xmpp_alerts: error sending "
+ "message with lvalert_send: {e}").format(e=err))
--
GitLab