add timeout params

Author: opapy

django_elastipymemcache/cluster_utils.py

@@ -18,7 +18,7 @@ def __init__(self, cmd, response):
             'Unexpected response {} for command {}'.format(response, cmd))
 
 
-def get_cluster_info(host, port):
+def get_cluster_info(host, port, timeout=None):
     """
     return dict with info about nodes in cluster and current version
     {
@@ -29,7 +29,7 @@ def get_cluster_info(host, port):
         'version': '1.4.4'
     }
     """
-    client = Telnet(host, int(port))
+    client = Telnet(host, int(port), timeout=None)
     client.write(b'version\n')
     res = client.read_until(b'\r\n').strip()
     version_list = res.split(b' ')

django_elastipymemcache/memcached.py

@@ -50,6 +50,7 @@ def __init__(self, server, params):
 
         # Patch for django<1.11
         self._options = self._options or dict()
+        self._cluster_timeout = self._options.get('cluster_timeout')
 
     def clear_cluster_nodes_cache(self):
         """clear internal cache with list of nodes in cluster"""
@@ -64,7 +65,8 @@ def get_cluster_nodes(self):
         try:
             return get_cluster_info(
                 server,
-                port
+                port,
+                self._cluster_timeout
             )['nodes']
         except (OSError, socket.gaierror, socket.timeout) as err:
             logger.debug(
@@ -76,9 +78,16 @@ def get_cluster_nodes(self):
 
     @property
     def _cache(self):
+
         if getattr(self, '_client', None) is None:
+
+            options = self._options
+            options.setdefault('ignore_exc', True)
+            options.pop('cluster_timeout', None)
+
             self._client = self._lib.Client(
-                self.get_cluster_nodes(), **self._options)
+                self.get_cluster_nodes(), **options)
+
         return self._client
 
     @invalidate_cache_after_error