SW-699: logging

LCS/Messaging/python/messaging/messagebus.py

@@ -1241,6 +1241,12 @@ class BusListener:
         """
         self.stop_listening()
 
+    def __str__(self):
+        return "%s using handler '%s' listening on queue '%s' at broker '%s'" % (self.__class__.__name__,
+                                                                                 self._handler_type.__name__,
+                                                                                 self.address,
+                                                                                 self.broker)
+
     def _create_handler(self):
         return self._handler_type(**self._handler_kwargs)
 

LCS/Messaging/python/messaging/rpc.py

@@ -354,9 +354,9 @@ class RPCClient():
                                              ttl=max(0, self._timeout - elapsed),
                                              priority=4).with_args_kwargs(*args, **kwargs)
 
-                logger.debug("executing rpc call to exchange=%s service.method=%s args=%s kwargs=%s waiting for answer on %s",
-                             exchange,
+                logger.debug("executing rpc call to service.method=%s via exchange=%s args=%s kwargs=%s waiting for answer on %s",
                              service_method,
+                             exchange,
                              args, kwargs,
                              tmp_reply_queue.address)
 
@@ -365,25 +365,25 @@ class RPCClient():
                 elapsed = (datetime.utcnow() - start_time).total_seconds()
                 wait_time = max(0, self._timeout - elapsed)
 
-                logger.debug("executed rpc call to exchange=%s service.method=%s waiting %.1fsec for answer on %s",
-                             exchange,
+                logger.debug("executed rpc call to service.method=%s via exchange=%s waiting %.1fsec for answer on %s",
                              service_method,
+                             exchange,
                              wait_time,
                              tmp_reply_queue.address)
 
                 answer = reply_receiver.receive(wait_time)
 
                 if answer is None:
-                    raise TimeoutError("rpc call to exchange=%s service.method=%s timed out" % (
-                                       exchange, service_method))
+                    raise TimeoutError("rpc call to service.method=%s via exchange=%s timed out after %.1fsec" % (
+                                       service_method, exchange, self._timeout))
 
                 if not isinstance(answer, ReplyMessage):
-                    raise ValueError("rpc call to exchange=%s service.method=%s received an unexpected non-ReplyMessage of type %s" % (
-                                     exchange, service_method, answer.__class__.__name__))
+                    raise ValueError("rpc call to service.method=%s via exchange=%s received an unexpected non-ReplyMessage of type %s" % (
+                                     service_method, exchange, answer.__class__.__name__))
 
-                logger.debug("executed rpc call to exchange=%s service.method=%s received valid answer on %s",
+                logger.debug("executed rpc call to service.method=%s via exchange=%s received valid answer on %s",
+                             service_method,
                              exchange,
-                             request_msg.subject,
                              tmp_reply_queue.address)
 
                 if answer.handled_successfully: