Merge pull request gusdan#10 from uncovertruth/bug/disconnect_all

add close method

Author: Surgo

django_elastipymemcache/memcached.py

@@ -5,6 +5,11 @@
 import socket
 from functools import wraps
 
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
 from django.core.cache import InvalidCacheBackendError
 from django.core.cache.backends.memcached import BaseMemcachedCache
 
@@ -15,6 +20,19 @@
 logger = logging.getLogger(__name__)
 
 
+def serialize_pickle(key, value):
+    if isinstance(value, str):
+        return value, 1
+    return pickle.dumps(value), 2
+
+
+def deserialize_pickle(key, value, flags):
+    if flags == 1:
+        return value
+    if flags == 2:
+        return pickle.loads(value)
+
+
 def invalidate_cache_after_error(f):
     """
     catch any exception and invalidate internal cache with list of nodes
@@ -83,6 +101,8 @@ def _cache(self):
         if getattr(self, '_client', None) is None:
 
             options = self._options
+            options['serializer'] = serialize_pickle
+            options['deserializer'] = deserialize_pickle
             options.setdefault('ignore_exc', True)
             options.pop('cluster_timeout', None)
 
@@ -91,6 +111,11 @@ def _cache(self):
 
         return self._client
 
+    def close(self, **kwargs):
+        # libmemcached manages its own connections. Don't call disconnect_all()
+        # as it resets the failover state and creates unnecessary reconnects.
+        pass
+
     @invalidate_cache_after_error
     def get(self, *args, **kwargs):
         return super(ElastiPyMemCache, self).get(*args, **kwargs)

tests/test_backend.py

@@ -18,7 +18,11 @@
 @patch('django.conf.settings', global_settings)
 @patch('django_elastipymemcache.memcached.get_cluster_info')
 def test_split_servers(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.memcached import (
+        ElastiPyMemCache,
+        deserialize_pickle,
+        serialize_pickle,
+    )
     backend = ElastiPyMemCache('h:0', {})
     servers = [('h1', 0), ('h2', 0)]
     get_cluster_info.return_value = {
@@ -28,13 +32,22 @@ def test_split_servers(get_cluster_info):
     assert backend._cache
     get_cluster_info.assert_called_once_with(
             'h', '0', socket._GLOBAL_DEFAULT_TIMEOUT)
-    backend._lib.Client.assert_called_once_with(servers, ignore_exc=True)
+    backend._lib.Client.assert_called_once_with(
+        servers,
+        deserializer=deserialize_pickle,
+        ignore_exc=True,
+        serializer=serialize_pickle
+    )
 
 
 @patch('django.conf.settings', global_settings)
 @patch('django_elastipymemcache.memcached.get_cluster_info')
 def test_node_info_cache(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.memcached import (
+        ElastiPyMemCache,
+        deserialize_pickle,
+        serialize_pickle,
+    )
     servers = [('h1', 0), ('h2', 0)]
     get_cluster_info.return_value = {
         'nodes': servers
@@ -46,7 +59,12 @@ def test_node_info_cache(get_cluster_info):
     backend.get('key1')
     backend.set('key2', 'val')
     backend.get('key2')
-    backend._lib.Client.assert_called_once_with(servers, ignore_exc=True)
+    backend._lib.Client.assert_called_once_with(
+        servers,
+        deserializer=deserialize_pickle,
+        ignore_exc=True,
+        serializer=serialize_pickle
+    )
     eq_(backend._cache.get.call_count, 2)
     eq_(backend._cache.set.call_count, 2)