OpenConceptLab/ocl_issues#927 Redis clustering, attempt to fix RedisS…

…ervice

core/common/services.py

@@ -200,14 +200,15 @@ def __resource(cls):
 
 
 class RedisService:  # pragma: no cover
-    def __init__(self):
-        self.conn = get_redis_connection('default')
+    @staticmethod
+    def get_client():
+        return get_redis_connection('default')
 
     def set(self, key, val, **kwargs):
-        return self.conn.set(key, val, **kwargs)
+        return self.get_client().set(key, val, **kwargs)
 
     def set_json(self, key, val):
-        return self.conn.set(key, json.dumps(val))
+        return self.get_client().set(key, json.dumps(val))
 
     def get_formatted(self, key):
         val = self.get(key)
@@ -222,21 +223,21 @@ def get_formatted(self, key):
         return val
 
     def exists(self, key):
-        return self.conn.exists(key)
+        return self.get_client().exists(key)
 
     def get(self, key):
-        return self.conn.get(key)
+        return self.get_client().get(key)
 
     def keys(self, pattern):
-        return self.conn.keys(pattern)
+        return self.get_client().keys(pattern)
 
     def get_int(self, key):
-        return int(self.conn.get(key).decode('utf-8'))
+        return int(self.get_client().get(key).decode('utf-8'))
 
     def get_pending_tasks(self, queue, include_task_names, exclude_task_names=None):
         # queue = 'bulk_import_root'
         # task_name = 'core.common.tasks.bulk_import_parallel_inline'
-        values = self.conn.lrange(queue, 0, -1)
+        values = self.get_client().lrange(queue, 0, -1)
         tasks = []
         exclude_task_names = exclude_task_names or []
         if values:

core/settings.py

@@ -305,7 +305,7 @@
 REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
 REDIS_DB = 0
 REDIS_HOST = os.environ.get('REDIS_HOST', 'redis')
-REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}"
+REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
 
 REDIS_SENTINELS = os.environ.get('REDIS_SENTINELS', None)
 REDIS_SENTINELS_MASTER = os.environ.get('REDIS_SENTINELS_MASTER', 'default')