set socket._GLOBAL_DEFAULT_TIMEOUT as default value for telnet

Author: opapy

django_elastipymemcache/cluster_utils.py

@@ -3,6 +3,7 @@
 """
 import re
 from distutils.version import StrictVersion
+import socket
 from telnetlib import Telnet
 
 from django.utils.encoding import smart_text
@@ -18,7 +19,7 @@ def __init__(self, cmd, response):
             'Unexpected response {} for command {}'.format(response, cmd))
 
 
-def get_cluster_info(host, port, timeout=None):
+def get_cluster_info(host, port, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
     """
     return dict with info about nodes in cluster and current version
     {
@@ -29,7 +30,7 @@ def get_cluster_info(host, port, timeout=None):
         'version': '1.4.4'
     }
     """
-    client = Telnet(host, int(port), timeout=None)
+    client = Telnet(host, int(port), timeout=timeout)
     client.write(b'version\n')
     res = client.read_until(b'\r\n').strip()
     version_list = res.split(b' ')

django_elastipymemcache/memcached.py

@@ -50,7 +50,8 @@ def __init__(self, server, params):
 
         # Patch for django<1.11
         self._options = self._options or dict()
-        self._cluster_timeout = self._options.get('cluster_timeout')
+        self._cluster_timeout = self._options.get(
+                'cluster_timeout', socket._GLOBAL_DEFAULT_TIMEOUT)
 
     def clear_cluster_nodes_cache(self):
         """clear internal cache with list of nodes in cluster"""

tests/test_backend.py

@@ -1,3 +1,4 @@
+import socket
 import sys
 
 from django.conf import global_settings, settings
@@ -25,7 +26,7 @@ def test_split_servers(get_cluster_info):
     }
     backend._lib.Client = Mock()
     assert backend._cache
-    get_cluster_info.assert_called_once_with('h', '0', None)
+    get_cluster_info.assert_called_once_with('h', '0', socket._GLOBAL_DEFAULT_TIMEOUT)
     backend._lib.Client.assert_called_once_with(servers, ignore_exc=True)
 
 
@@ -48,7 +49,7 @@ def test_node_info_cache(get_cluster_info):
     eq_(backend._cache.get.call_count, 2)
     eq_(backend._cache.set.call_count, 2)
 
-    get_cluster_info.assert_called_once_with('h', '0', None)
+    get_cluster_info.assert_called_once_with('h', '0', socket._GLOBAL_DEFAULT_TIMEOUT)
 
 
 @patch('django.conf.settings', global_settings)