Skip to content
This repository has been archived by the owner on Mar 4, 2024. It is now read-only.

A3S-2753 Fixed redis SSL connection #14

Merged
merged 3 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mrq/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions mrq/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mrq/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = "0.9.32"
VERSION = "0.9.33.3"

if __name__ == "__main__":
import sys
Expand Down
6 changes: 5 additions & 1 deletion mrq/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down