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

Merge pull request #1908 from leonelcamara/make_sure_to_unlock_redis

Browse Source 
Release the lock even if function call fails
This commit is contained in:
mdipierro
2018-04-29 19:50:33 -05:00
committed by GitHub
parent 9fb33e6b93 d6f426ed29
commit a79ec41b3b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gluon/contrib/redis_cache.py
View File

@@ -159,13 +159,15 @@ class RedisClient(object):
lock_key = '%s:__lock' % newKey
randomvalue = time.time()
al = acquire_lock(self.r_server, lock_key, randomvalue)
# someone may have computed it
obj = self.r_server.get(newKey)
if obj is None:
value = self.cache_it(newKey, f, time_expire)
else:
value = pickle.loads(obj)
release_lock(self, lock_key, al)
try:
# someone may have computed it
obj = self.r_server.get(newKey)
if obj is None:
value = self.cache_it(newKey, f, time_expire)
else:
value = pickle.loads(obj)
finally:
release_lock(self, lock_key, al)
else:
# without distributed locking
value = self.cache_it(newKey, f, time_expire)