Skip to content
Snippets Groups Projects
Commit 04e4699a authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

SW-699: minor tweaks, logging, renaming

parent fc0a858c
Branches
Tags
No related merge requests found
...@@ -287,7 +287,7 @@ class RPCWrapper(object): ...@@ -287,7 +287,7 @@ class RPCWrapper(object):
def close(self): def close(self):
'''Close all opened rpc connections''' '''Close all opened rpc connections'''
for rpc in list(self._serviceRPCs.values()): 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() rpc.close()
def __enter__(self): def __enter__(self):
...@@ -311,7 +311,7 @@ class RPCWrapper(object): ...@@ -311,7 +311,7 @@ class RPCWrapper(object):
# not in cache # not in cache
# so, create RPC for this service method, open it, and cache it # 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) 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() rpc.open()
self._serviceRPCs[service_method] = rpc self._serviceRPCs[service_method] = rpc
......
...@@ -99,7 +99,8 @@ class Service(AbstractBusListener): ...@@ -99,7 +99,8 @@ class Service(AbstractBusListener):
busname: str, busname: str,
num_threads: int = 1, num_threads: int = 1,
broker: str = DEFAULT_BROKER, broker: str = DEFAULT_BROKER,
**kwargs): use_service_methods = False,
handler_args = None):
""" """
Initialize Service object with servicename (str) and servicehandler function. Initialize Service object with servicename (str) and servicehandler function.
additional parameters: additional parameters:
...@@ -111,8 +112,8 @@ class Service(AbstractBusListener): ...@@ -111,8 +112,8 @@ class Service(AbstractBusListener):
Example: MyService.foo calls the method foo in the handler. Example: MyService.foo calls the method foo in the handler.
""" """
self.service_name = service_name self.service_name = service_name
self.use_service_methods = kwargs.pop("use_service_methods", False) self.use_service_methods = use_service_methods
self.handler_args = kwargs.pop("handler_args", {}) self.handler_args = handler_args
# set up service_handler, either for a wrapped function, or a MessageHandlerInterface # 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'>": if str(type(service_handler)) == "<class 'instancemethod'>" or str(type(service_handler)) == "<class 'function'>":
...@@ -202,7 +203,6 @@ class Service(AbstractBusListener): ...@@ -202,7 +203,6 @@ class Service(AbstractBusListener):
else: else:
replymessage = serviceHandlerMethod() replymessage = serviceHandlerMethod()
#TODO: check for timeout and/or presence of response queue!
self._send_reply(replymessage,"OK",lofar_msg.reply_to) self._send_reply(replymessage,"OK",lofar_msg.reply_to)
except Exception as e: except Exception as e:
......
...@@ -507,7 +507,7 @@ class PingPongPlayer(AbstractBusListener): ...@@ -507,7 +507,7 @@ class PingPongPlayer(AbstractBusListener):
"""Implementation of AbstractBusListener._handleMessage """Implementation of AbstractBusListener._handleMessage
log received message, and send response. 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) self.send_response(msg.content)
def send_response(self, value): def send_response(self, value):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment