dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1375 from niphlod/fix/1355

Browse Source 
fixes #1355
This commit is contained in:
mdipierro
2016-07-01 01:56:02 -05:00
committed by GitHub
parent 46d02a3448 a96f137e03
commit 5a5c2b500a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/redis_cache.py
+5 -4
View File
@@ -85,7 +85,7 @@ def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=Fa
try: try:
instance_name = 'redis_instance_' + current.request.application instance_name = 'redis_instance_' + current.request.application
if not hasattr(RedisCache, instance_name): if not hasattr(RedisCache, instance_name):
setattr(RedisCache, instance_name, setattr(RedisCache, instance_name,
RedisClient(redis_conn=redis_conn, debug=debug, RedisClient(redis_conn=redis_conn, debug=debug,
with_lock=with_lock, fail_gracefully=fail_gracefully)) with_lock=with_lock, fail_gracefully=fail_gracefully))
return getattr(RedisCache, instance_name) return getattr(RedisCache, instance_name)
@@ -137,6 +137,10 @@ class RedisClient(object):
value = None value = None
ttl = 0 ttl = 0
try: try:
if f is None:
# delete and never look back
self.r_server.delete(newKey)
return None
# is there a value # is there a value
obj = self.r_server.get(newKey) obj = self.r_server.get(newKey)
# what's its ttl # what's its ttl
@@ -149,9 +153,6 @@ class RedisClient(object):
if self.debug: if self.debug:
self.r_server.incr('web2py_cache_statistics:hit_total') self.r_server.incr('web2py_cache_statistics:hit_total')
value = pickle.loads(obj) value = pickle.loads(obj)
elif f is None:
# delete and never look back
self.r_server.delete(newKey)
else: else:
# naive distributed locking # naive distributed locking
if with_lock: if with_lock: