Merge branch 'master' into library_updates_q2_2023

Author: marlonkeating

common/helpers/queue.py

@@ -2,13 +2,23 @@
 import redis
 import threading
 from rq import Queue
+from ssl import CERT_NONE
 from typing import Callable
 from django.conf import settings
+from urllib.parse import urlparse
 
-redis_url = os.getenv('REDIS_URL', 'redis://localhost:6379')
-conn = redis.from_url(redis_url)
-q = settings.REDIS_ENABLED and Queue(connection=conn)
 
+redis_url = os.getenv('REDIS_URL','redis://localhost:6379')
+url = urlparse(redis_url)
+# Check if the Redis connection is using SSL/TSL
+is_secure = redis_url.startswith('rediss://')
+
+if is_secure:
+    conn = redis.Redis(host=url.hostname, port=url.port, username=url.username, password=url.password, ssl=True, ssl_cert_reqs=None)
+else:
+    conn = redis.from_url(redis_url)
+
+q = settings.REDIS_ENABLED and Queue(connection=conn)
 
 def enqueue(job_func: Callable, *args):
     if settings.REDIS_ENABLED:
@@ -21,3 +31,4 @@ def enqueue(job_func: Callable, *args):
         thread = threading.Thread(target=job_func, args=args)
         thread.daemon = True
         thread.start()
+