From 9ddd63de9f10fc12b13e1b9e2a0ea00440d36044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Wed, 12 Jun 2019 14:24:09 +0000
Subject: [PATCH] SW-699: Alter TriggerEmailService to work with the messaging
overhaul to RabbitMQ
---
.../Server/lib/TriggerEmailService.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py b/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py
index b63900bd2d7..3ebe6bcb3f0 100644
--- a/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py
+++ b/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py
@@ -34,7 +34,7 @@ from datetime import timedelta, datetime
import time
from lofar.sas.otdb.OTDBBusListener import OTDBBusListener
from lofar.common.util import waitForInterrupt
-from lofar.messaging.messagebus import AbstractBusListener
+from lofar.messaging.messagebus import BusListener
from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
from lofar.sas.TriggerEmailService.common.config import DEFAULT_TRIGGER_NOTIFICATION_SUBJECT
from lofar.mom.momqueryservice.momqueryrpc import MoMQueryRPC
@@ -80,13 +80,13 @@ class MoMIdError(Exception):
class OTDBTriggerListener(OTDBBusListener):
def __init__(self, momquery_rpc=MoMQueryRPC(), busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER):
- super(OTDBTriggerListener, self).__init__(busname=busname, broker=broker)
+ super(OTDBTriggerListener, self).__init__(exchange=busname, broker=broker)
self.mom_rpc_client = momquery_rpc
def start_listening(self, **kwargs):
self.mom_rpc_client.open()
- super(OTDBTriggerListener, self).start_listening(**kwargs)
+ super(OTDBTriggerListener, self).start_listening()
def stop_listening(self):
self.mom_rpc_client.close()
@@ -172,7 +172,7 @@ class OTDBTriggerListener(OTDBBusListener):
return recipients
-class TriggerNotificationListener(AbstractBusListener):
+class TriggerNotificationListener(BusListener):
def __init__(self, momquery_rpc=MoMQueryRPC(), busname=DEFAULT_BUSNAME, broker=DEFAULT_BROKER):
"""
TriggerNotificationListener listens on the lofar trigger message bus and emails when trigger gets submitted.
@@ -255,7 +255,7 @@ class TriggerNotificationListener(AbstractBusListener):
def start_listening(self, **kwargs):
self.mom_rpc_client.open()
- super(TriggerNotificationListener, self).start_listening(**kwargs)
+ super(TriggerNotificationListener, self).start_listening()
def stop_listening(self):
self.mom_rpc_client.close()
--
GitLab