Task #8582: merged changes to PyMessaging back to trunk

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)

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

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"]