Changeset 8418

Timestamp:

08/16/08 18:35:58 (4 months ago)

Author:

mtredinnick

Message:

Fixed #5133 -- Explicitly close memcached connections after each request
(similar to database connection management). We can't effectively manage the
lifecycle by pooling connections and recent versions of python-memcache can
lead to connection exhaustion in some quite reasonable setups.

Files:

• django/trunk/django/core/cache/backends/memcached.py (modified) (1 diff)
• django/trunk/django/core/cache/__init__.py (modified) (2 diffs)

django/trunk/django/core/cache/backends/memcached.py

@@ -40 +40 @@
-    def get_many(self, keys):
-        return self._cache.get_multi(map(smart_str,keys))
+
+    def close(self, **kwargs):
+        self._cache.disconnect_all()
+

django/trunk/django/core/cache/__init__.py

@@ -18 +18 @@
-from cgi import parse_qsl
-from django.conf import settings
+from django.core import signals
-from django.core.cache.backends.base import InvalidCacheBackendError
-
@@ -55 +56 @@
-
-cache = get_cache(settings.CACHE_BACKEND)
+
+# Some caches -- pythont-memcached in particular -- need to do a cleanup at the
+# end of a request cycle. If the cache provides a close() method, wire it up
+# here.
+if hasattr(cache, 'close'):
+    signals.request_finished.connect(cache.close)
+