From 2dd16ee797f5a714623a04a53782bbbc7bafcf41 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 1 Dec 2015 15:15:39 +0000
Subject: [PATCH] Task #8582: merged changes to PyMessaging back to trunk
---
LCS/Messaging/python/messaging/RPC.py | 6 +++---
LCS/Messaging/python/messaging/Service.py | 4 ++--
LCS/Messaging/python/messaging/messagebus.py | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LCS/Messaging/python/messaging/RPC.py b/LCS/Messaging/python/messaging/RPC.py
index f9123509f60..b35f524f84d 100644
--- a/LCS/Messaging/python/messaging/RPC.py
+++ b/LCS/Messaging/python/messaging/RPC.py
@@ -20,8 +20,8 @@
#
# RPC invocation with possible timeout
-from lofar.messaging.messagebus import ToBus, FromBus
-from lofar.messaging.messages import RequestMessage, ReplyMessage
+from .messagebus import ToBus, FromBus
+from .messages import RequestMessage, ReplyMessage
import uuid
def _analyze_args(args,kwargs):
@@ -126,7 +126,7 @@ class RPC():
else:
Reply = FromBus("%s/%s" % (self.BusName, ReplyAddress))
with Reply:
- MyMsg = RequestMessage(Content, ReplyAddress , has_args=HasArgs, has_kwargs=HasKwArgs)
+ MyMsg = RequestMessage(content=Content, reply_to=ReplyAddress, has_args=HasArgs, has_kwargs=HasKwArgs)
MyMsg.ttl = timeout
self.Request.send(MyMsg)
answer = Reply.receive(timeout)
diff --git a/LCS/Messaging/python/messaging/Service.py b/LCS/Messaging/python/messaging/Service.py
index ccf7a0e07e0..3a7434a2a1c 100644
--- a/LCS/Messaging/python/messaging/Service.py
+++ b/LCS/Messaging/python/messaging/Service.py
@@ -20,8 +20,8 @@
# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
#
-from lofar.messaging.messagebus import ToBus,FromBus
-from lofar.messaging.messages import ReplyMessage,RequestMessage
+from .messagebus import ToBus,FromBus
+from .messages import ReplyMessage,RequestMessage
import threading
import time
import uuid
diff --git a/LCS/Messaging/python/messaging/messagebus.py b/LCS/Messaging/python/messaging/messagebus.py
index a6cc7b208c4..b8065dd1f21 100644
--- a/LCS/Messaging/python/messaging/messagebus.py
+++ b/LCS/Messaging/python/messaging/messagebus.py
@@ -176,8 +176,8 @@ class FromBus(object):
raise_exception(MessageBusError,
"[FromBus] Failed to fetch message from queue: "
"%s" % self.address)
- logger.info("[FromBus] Message received on queue: %s", self.address)
- logger.debug("[FromBus] %s", msg)
+ logger.info("[FromBus] Message received on queue: %s subject: %s" % (self.address, msg.subject))
+ logger.debug("[FromBus] %s" % msg)
try:
amsg = MESSAGE_FACTORY.create(msg)
except MessageFactoryError:
@@ -399,7 +399,7 @@ class ToBus(object):
raise_exception(MessageBusError,
"[ToBus] Failed to send message to queue: %s" %
sender.target)
- logger.info("[ToBus] Message sent to queue: %s", sender.target)
+ logger.info("[ToBus] Message sent to queue: %s subject: %s" % (sender.target, message.subject))
__all__ = ["FromBus", "ToBus"]
--
GitLab