Merge pull request #1375 from niphlod/fix/1355

fixes #1355
This commit is contained in:
mdipierro
2016-07-01 01:56:02 -05:00
committed by GitHub
+4 -3
View File
@@ -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: