Fix logs and add client retry_timeout

Author: paskozdilar

zrpc/client.py

@@ -21,7 +21,7 @@
 
 
 class Client:
-    def __init__(self, socket_dir=None):
+    def __init__(self, socket_dir=None, retry_timeout=None):
         socket_dir = os.path.abspath(socket_dir or '/tmp/zrpc_sockets')
 
         context = zmq.Context.instance()
@@ -30,7 +30,9 @@ def __init__(self, socket_dir=None):
         self._context = context
         self._poller = zmq.Poller()
         self._sockets = sockets
+
         self._socket_dir = socket_dir
+        self._retry_timeout = retry_timeout or 1
 
         try:
             os.makedirs(socket_dir, exist_ok=True)
@@ -41,8 +43,8 @@ def __init__(self, socket_dir=None):
 
     def __del__(self):
         try:
-            for socket in self._sockets:
-                socket.close(linger=0)
+            for socket_name in list(self._sockets.keys()):
+                self.__disconnect(socket_name)
         except AttributeError:
             pass
 
@@ -61,7 +63,7 @@ def __connect(self, socket_name):
         sockets[socket_name] = socket
 
         self._poller.register(socket, zmq.POLLIN)
-        logger.debug('Connected to "%s"' % socket_name)
+        logger.debug('Connected to "%s"', socket_name)
 
     def __disconnect(self, socket_name):
         sockets = self._sockets
@@ -73,7 +75,7 @@ def __disconnect(self, socket_name):
         socket.close(linger=0)
 
         self._poller.unregister(socket)
-        logger.debug('Disconnected from "%s"' % socket_name)
+        logger.debug('Disconnected from "%s"', socket_name)
 
     def call(self, server, method, args=(), kwargs={}, timeout=None):
         """
@@ -99,17 +101,17 @@ def call(self, server, method, args=(), kwargs={}, timeout=None):
         current_time = start_time
         elapsed_time = current_time - start_time
 
-        iter_timeout = 1
+        retry_timeout = self._retry_timeout
         while elapsed_time <= timeout:
             socket.send(request)
-            timeout_ms = 1000 * max(0, min(iter_timeout, timeout - elapsed_time))
-            logging.debug('Polling sockets with {}ms timeout'.format(timeout_ms))
+            timeout_ms = 1000 * max(0, min(retry_timeout, timeout - elapsed_time))
+            logging.debug('Polling sockets with %s ms timeout', timeout_ms)
             events = dict(self._poller.poll(timeout=timeout_ms))
 
             if socket in events:
                 break
 
-            logger.error('No response from "%s"- reconnecting...' % server)
+            logger.error('No response from "%s" - reconnecting...' % server)
             self.__disconnect(server)
             self.__connect(server)
             socket = sockets[server]

zrpc/server.py

@@ -38,12 +38,12 @@ def __init__(self, maxsize=128, *args, **kwds):
 
     def __getitem__(self, key):
         value = super().__getitem__(key)
-        Server.move_to_end(self, key)
+        self.move_to_end(key)
         return value
 
     def __setitem__(self, key, value):
         if key in self:
-            Server.move_to_end(self, key)
+            self.move_to_end(key)
         super().__setitem__(key, value)
         if len(self) > self.maxsize:
             oldest = next(iter(self))
@@ -78,7 +78,8 @@ def __init__(self, name=None, socket_dir=None):
         self.__started = False
 
     def __del__(self):
-        Server.stop(self)
+        if self.__started:
+            Server.stop(self)
 
     def __enter__(self):
         Server.start(self)
@@ -89,7 +90,7 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
 
     def start(self):
         if self.__started:
-            return
+            raise RuntimeError('Server already started')
 
         name = self.__name
         socket_dir = self.__socket_dir
@@ -137,7 +138,7 @@ def start(self):
     def stop(self):
         try:
             if not self.__started:
-                return
+                raise RuntimeError('Server already started')
             self.__socket.close(linger=0)
             os.unlink(self.__socket_path)
         except (OSError, AttributeError):
@@ -197,9 +198,9 @@ def run_once(self, timeout=None):
         socket = self.__socket
         poller = self.__poller
 
-        self.__logger.info('Polling for requests...')
+        self.__logger.debug('Polling for requests...')
         ready_sockets = dict(poller.poll(timeout=timeout))
-        self.__logger.info('Ready_sockets: {}'.format(ready_sockets))
+        self.__logger.debug('Ready_sockets: {}'.format(ready_sockets))
 
         for ready_socket in ready_sockets:
             if ready_socket is socket:
@@ -221,6 +222,7 @@ def __handle_request(self, socket):
 
         if request_id in self.__cache:
             # resend response silently
+            self.__logger.debug('Returning request from cache: %s', request_id)
             response_data = self.__cache[request_id]
             socket.send(self.__cache[request_id])
             return