Fix worker redis connection

Signed-off-by: Kipchirchir Sigei <arapgodsmack@gmail.com>

app/api/deps.py

@@ -18,7 +18,9 @@ def get_db() -> Generator:
 
 def get_redis_client() -> Generator:
     try:
-        client = redis.from_url(str(settings.REDIS_URL))
+        client = redis.from_url(
+            str(settings.REDIS_URL), socket_timeout=30, socket_connect_timeout=30
+        )
         yield client
     finally:
         client.close()

app/core/config.py

@@ -2,7 +2,7 @@
 from urllib.parse import quote_plus
 
 from cryptography.fernet import Fernet
-from pydantic import AnyHttpUrl, HttpUrl, RedisDsn, validator
+from pydantic import AnyHttpUrl, HttpUrl, validator
 from pydantic_settings import BaseSettings
 
 

app/jobs/jobs.py

@@ -3,13 +3,13 @@
 from tableauhyperapi import HyperProcess, Telemetry
 
 from app.common_tags import HYPER_PROCESS_CACHE_KEY
-from app.settings import settings
+from app.core.config import settings
 from app.utils.onadata_utils import start_csv_import_to_hyper
 
 
 def csv_import_job(instance_id):
     # Connect to redis cache
-    rc = RedisCacheBackend(settings.redis_url)
+    rc = RedisCacheBackend(settings.REDIS_URL)
     caches.set(CACHE_KEY, rc)
 
     # Check if Hyper Process has started

app/jobs/scheduler.py

@@ -10,7 +10,7 @@
 CRON_SCHEDULE = os.environ.get("CRON_SCHEDULE", "*/15 * * * *")
 TASK_TIMEOUT = os.environ.get("TASK_TIMEOUT", "3600")
 REDIS_URL = os.environ.get("REDIS_URL", "redis://localhost:6379/1")
-REDIS_CONN = Redis.from_url(REDIS_URL)
+REDIS_CONN = Redis.from_url(REDIS_URL, socket_timeout=30, socket_connect_timeout=30)
 QUEUE = Queue(QUEUE_NAME, connection=REDIS_CONN)
 
 

app/jobs/worker.py

@@ -6,19 +6,21 @@
 from rq import Connection, Queue, Worker
 from sentry_sdk.integrations.rq import RqIntegration
 
-from app.settings import settings
+from app.core.config import settings
 
 # Preload libraries
 
 QUEUE_NAME = os.environ.get("QUEUE_NAME", "default")
 
 
-redis_conn = Redis.from_url(settings.redis_url)
+redis_conn = Redis.from_url(
+    settings.REDIS_URL, socket_timeout=30, socket_connect_timeout=30
+)
 
 # Provide queue names to listen to as arguments to this script,
 # similar to rq worker
 with Connection():
-    if settings.sentry_dsn:
+    if settings.SENTRY_DSN:
         sentry_sdk.init(settings.sentry_dsn, integrations=[RqIntegration()])
     queue = Queue(QUEUE_NAME, connection=redis_conn)
 

app/utils/utils.py

@@ -6,7 +6,7 @@
 import redis
 
 from app.database.session import SessionLocal
-from app.settings import settings
+from app.core.config import settings
 
 
 def get_db():
@@ -19,7 +19,7 @@ def get_db():
 
 def get_redis_client():
     redis_client = redis.Redis(
-        host=settings.redis_host, port=settings.redis_port, db=settings.redis_db
+        host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=settings.REDIS_DB
     )
     try:
         yield redis_client