Merge pull request #538 from apahomov/redis-kvstore-timeout

Redis KV Store timeout
jazzband · Jul 21, 2018 · 15400fb · 15400fb
2 parents 6b18e38 + dd710a4
commit 15400fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/docs/reference/settings.rst b/docs/reference/settings.rst
@@ -191,6 +191,15 @@ The host for Redis server. Only applicable for the Redis Key Value Store
 The port for Redis server. Only applicable for the Redis Key Value Store
 
 
+``THUMBNAIL_REDIS_TIMEOUT``
+===========================
+
+- Default: ``3600 * 24 * 365 * 10``
+
+Cache timeout for Redis Key Value Store in seconds. You should probably keep this 
+at maximum or ``None``.
+
+
 ``THUMBNAIL_DBM_FILE``
 ======================
 

diff --git a/sorl/thumbnail/conf/defaults.py b/sorl/thumbnail/conf/defaults.py
@@ -40,6 +40,7 @@
 THUMBNAIL_REDIS_HOST = 'localhost'
 THUMBNAIL_REDIS_PORT = 6379
 THUMBNAIL_REDIS_UNIX_SOCKET_PATH = None
+THUMBNAIL_REDIS_TIMEOUT = 3600 * 24 * 365 * 10  # 10 years
 
 # DBM settings
 THUMBNAIL_DBM_FILE = "thumbnail_kvstore"

diff --git a/sorl/thumbnail/kvstores/redis_kvstore.py b/sorl/thumbnail/kvstores/redis_kvstore.py
@@ -24,7 +24,8 @@ def _get_raw(self, key):
         return self.connection.get(key)
 
     def _set_raw(self, key, value):
-        return self.connection.set(key, value)
+        return self.connection.set(
+            key, value, ex=settings.THUMBNAIL_REDIS_TIMEOUT)
 
     def _delete_raw(self, *keys):
         return self.connection.delete(*keys)