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

fixes #2058

Browse Source 
I've modified redis_cache.py to be able to optionally provide an application name to RedisCache constructor. This makes possible to share cache between different web2py applications if needed.
This commit is contained in:
erbalito
2018-11-21 09:40:19 -03:00
committed by GitHub
parent bf27c8c394
commit 9d8fce0687
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/redis_cache.py
+14 -9
View File
@@ -22,7 +22,7 @@ logger = logging.getLogger("web2py.cache.redis")
locker = Lock() locker = Lock()
def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=False, db=None): def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=False, db=None, application=None):
""" """
Usage example: put in models:: Usage example: put in models::
@@ -47,6 +47,8 @@ def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=Fa
When True, only one thread/process can set a value concurrently When True, only one thread/process can set a value concurrently
fail_gracefully: if redis is unavailable, returns the value computing it fail_gracefully: if redis is unavailable, returns the value computing it
instead of raising an exception instead of raising an exception
application: if provided, it is used to construct the instance_name,
allowing to share cache between different applications if needed
It can be used pretty much the same as cache.ram() It can be used pretty much the same as cache.ram()
When you use cache.redis directly you can use : When you use cache.redis directly you can use :
@@ -83,11 +85,14 @@ def RedisCache(redis_conn=None, debug=False, with_lock=False, fail_gracefully=Fa
locker.acquire() locker.acquire()
try: try:
instance_name = 'redis_instance_' + current.request.application if not application:
application = current.request.application
instance_name = 'redis_instance_' + 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,
application=application))
return getattr(RedisCache, instance_name) return getattr(RedisCache, instance_name)
finally: finally:
locker.release() locker.release()
@@ -100,14 +105,15 @@ class RedisClient(object):
RETRIES = 0 RETRIES = 0
def __init__(self, redis_conn=None, debug=False, def __init__(self, redis_conn=None, debug=False,
with_lock=False, fail_gracefully=False): with_lock=False, fail_gracefully=False, application=None):
self.request = current.request self.request = current.request
self.debug = debug self.debug = debug
self.with_lock = with_lock self.with_lock = with_lock
self.fail_gracefully = fail_gracefully self.fail_gracefully = fail_gracefully
self.prefix = "w2p:cache:%s:" % self.request.application self.application = application
self.prefix = "w2p:cache:%s:" % application
if self.request: if self.request:
app = self.request.application app = application
else: else:
app = '' app = ''
@@ -120,7 +126,7 @@ class RedisClient(object):
else: else:
self.storage = self.meta_storage[app] self.storage = self.meta_storage[app]
self.cache_set_key = 'w2p:%s:___cache_set' % self.request.application self.cache_set_key = 'w2p:%s:___cache_set' % application
self.r_server = redis_conn self.r_server = redis_conn
self._release_script = register_release_lock(self.r_server) self._release_script = register_release_lock(self.r_server)
@@ -276,8 +282,7 @@ class RedisClient(object):
) )
stats_collector['w2p_keys'] = dict() stats_collector['w2p_keys'] = dict()
for a in self.r_server.keys("w2p:%s:*" % ( for a in self.r_server.keys("w2p:%s:*" % self.application):
self.request.application)):
stats_collector['w2p_keys']["%s_expire_in_sec" % a] = self.r_server.ttl(a) stats_collector['w2p_keys']["%s_expire_in_sec" % a] = self.r_server.ttl(a)
return stats_collector return stats_collector