diff --git a/LCS/Messaging/python/messaging/RPC.py b/LCS/Messaging/python/messaging/RPC.py index 24550f9b35e4123292275e31e5eed8db61735a34..a0ca7fd67876fa36a165f9b11962d9543eaa9c87 100644 --- a/LCS/Messaging/python/messaging/RPC.py +++ b/LCS/Messaging/python/messaging/RPC.py @@ -287,7 +287,7 @@ class RPCWrapper(object): def close(self): '''Close all opened rpc connections''' for rpc in list(self._serviceRPCs.values()): - logger.info('closing rpc connection %s at %s', rpc._request_sender.address, rpc._broker) + logger.debug('closing rpc connection %s at %s', rpc._request_sender.address, rpc._broker) rpc.close() def __enter__(self): @@ -311,7 +311,7 @@ class RPCWrapper(object): # not in cache # so, create RPC for this service method, open it, and cache it rpc = RPC(service_method, busname=self.busname, broker=self.broker, timeout=self.timeout) - logger.info('opening rpc connection method=%s address=%s broker=%s', service_method, rpc._request_sender.address, rpc._broker) + logger.debug('opening rpc connection method=%s address=%s broker=%s', service_method, rpc._request_sender.address, rpc._broker) rpc.open() self._serviceRPCs[service_method] = rpc diff --git a/LCS/Messaging/python/messaging/Service.py b/LCS/Messaging/python/messaging/Service.py index 247dcc0b81782416aa44e33b3de36cb2d7b17515..274f50291a5c334cdf99fbf0d9a3679090f32711 100644 --- a/LCS/Messaging/python/messaging/Service.py +++ b/LCS/Messaging/python/messaging/Service.py @@ -99,7 +99,8 @@ class Service(AbstractBusListener): busname: str, num_threads: int = 1, broker: str = DEFAULT_BROKER, - **kwargs): + use_service_methods = False, + handler_args = None): """ Initialize Service object with servicename (str) and servicehandler function. additional parameters: @@ -111,8 +112,8 @@ class Service(AbstractBusListener): Example: MyService.foo calls the method foo in the handler. """ self.service_name = service_name - self.use_service_methods = kwargs.pop("use_service_methods", False) - self.handler_args = kwargs.pop("handler_args", {}) + self.use_service_methods = use_service_methods + self.handler_args = handler_args # set up service_handler, either for a wrapped function, or a MessageHandlerInterface if str(type(service_handler)) == "<class 'instancemethod'>" or str(type(service_handler)) == "<class 'function'>": @@ -202,7 +203,6 @@ class Service(AbstractBusListener): else: replymessage = serviceHandlerMethod() - #TODO: check for timeout and/or presence of response queue! self._send_reply(replymessage,"OK",lofar_msg.reply_to) except Exception as e: diff --git a/LCS/Messaging/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py index e641d9013829444a790a5d37a7b7156bd3557e29..4536db012f214408bb8a67c27bf46393e41f1465 100644 --- a/LCS/Messaging/python/messaging/test/t_messagebus.py +++ b/LCS/Messaging/python/messaging/test/t_messagebus.py @@ -507,7 +507,7 @@ class PingPongPlayer(AbstractBusListener): """Implementation of AbstractBusListener._handleMessage log received message, and send response. """ - logger.info("%s: received %s on %s", self.name, msg.content, self.queue_address) + logger.info("%s: received %s on %s", self.name, msg.content, self.queue_name) self.send_response(msg.content) def send_response(self, value):