Merge pull request #345 from crimsoncantab/master
related to issue 1708 - bugfix to allow no expiration for gae_memcache
This commit is contained in:
@@ -27,15 +27,11 @@ class MemcacheClient(object):
|
|||||||
time_expire=300,
|
time_expire=300,
|
||||||
):
|
):
|
||||||
key = '%s/%s' % (self.request.application, key)
|
key = '%s/%s' % (self.request.application, key)
|
||||||
dt = time_expire
|
|
||||||
value = None
|
value = None
|
||||||
obj = self.client.get(key)
|
obj = self.client.get(key)
|
||||||
if obj and (dt is None or obj[0] > time.time() - dt):
|
if obj:
|
||||||
value = obj[1]
|
value = obj[1]
|
||||||
elif f is None:
|
elif f is not None:
|
||||||
if obj:
|
|
||||||
self.client.delete(key)
|
|
||||||
else:
|
|
||||||
value = f()
|
value = f()
|
||||||
self.client.set(key, (time.time(), value), time=time_expire)
|
self.client.set(key, (time.time(), value), time=time_expire)
|
||||||
return value
|
return value
|
||||||
|
|||||||
Reference in New Issue
Block a user