A3S-2753 Fixed redis SSL connection (#14)

* A3S-2753: Fixed redis connection
apploitech · May 15, 2023 · adf6ec9 · adf6ec9
1 parent 4143816
commit adf6ec9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/mrq/agent.py b/mrq/agent.py
@@ -8,7 +8,11 @@
 import traceback
 from collections import defaultdict
 from bson import ObjectId
-from redis.lock import LuaLock
+try:
+    from redis.lock import LuaLock
+except ImportError:
+    # Change name to avoid NameError raised when use of LuaLock at line 147
+    from redis.lock import Lock as LuaLock
 from .processes import Process, ProcessPool
 from .utils import MovingETA, normalize_command
 from .queue import Queue

diff --git a/mrq/context.py b/mrq/context.py
@@ -162,6 +162,7 @@ def versiontuple(v):
                 db=int((redis_url.path or "").replace("/", "") or "0"),
                 password=redis_url.password if redis_url.password is not None else redis_url.username,
                 max_connections=int(config.get("redis_max_connections")),
+                ssl_cert_reqs=None,
                 timeout=int(config.get("redis_timeout")),
                 decode_responses=False,
                 connection_class=connection_class

diff --git a/mrq/version.py b/mrq/version.py
@@ -1,4 +1,4 @@
-VERSION = "0.9.32"
+VERSION = "0.9.33.3"
 
 if __name__ == "__main__":
   import sys

diff --git a/mrq/worker.py b/mrq/worker.py
@@ -15,7 +15,11 @@
 import json as json_stdlib
 import ujson as json
 from bson import ObjectId
-from redis.lock import LuaLock
+try:
+    from redis.lock import LuaLock
+except ImportError:
+    # Change name to avoid NameError raised when use of LuaLock at line 147
+    from redis.lock import Lock as LuaLock
 from collections import defaultdict
 from mrq.utils import load_class_by_path