diff --git a/backend/config/__init__.py b/backend/config/__init__.py index 1ec54d3ed..a4e7296f3 100644 --- a/backend/config/__init__.py +++ b/backend/config/__init__.py @@ -29,6 +29,8 @@ DB_NAME: Final = os.environ.get("DB_NAME", "romm") REDIS_HOST: Final = os.environ.get("REDIS_HOST", "127.0.0.1") REDIS_PORT: Final = os.environ.get("REDIS_PORT", 6379) REDIS_PASSWORD: Final = os.environ.get("REDIS_PASSWORD") +REDIS_USERNAME: Final = os.environ.get("REDIS_USERNAME", "") +REDIS_DB: Final = int(os.environ.get("REDIS_DB", 0)) # IGDB IGDB_CLIENT_ID: Final = os.environ.get( diff --git a/backend/handler/redis_handler.py b/backend/handler/redis_handler.py index 65fd58106..88bab8321 100644 --- a/backend/handler/redis_handler.py +++ b/backend/handler/redis_handler.py @@ -1,7 +1,7 @@ import sys from enum import Enum -from config import REDIS_HOST, REDIS_PORT, REDIS_PASSWORD +from config import REDIS_HOST, REDIS_PORT, REDIS_PASSWORD, REDIS_USERNAME, REDIS_DB from logger.logger import log from redis import Redis from fakeredis import FakeStrictRedis @@ -14,8 +14,8 @@ class QueuePrio(Enum): LOW = "low" -redis_client = Redis(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWORD, db=0) -redis_url = f"redis://:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}" if REDIS_PASSWORD else f"redis://{REDIS_HOST}:{REDIS_PORT}" +redis_client = Redis(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWORD, username=REDIS_USERNAME, db=REDIS_DB) +redis_url = f"redis://{REDIS_USERNAME}:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}" if REDIS_PASSWORD else f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}" high_prio_queue = Queue(name=QueuePrio.HIGH.value, connection=redis_client) default_queue = Queue(name=QueuePrio.DEFAULT.value, connection=redis_client) @@ -30,7 +30,8 @@ else: host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWORD, - db=0, + username=REDIS_USERNAME, + db=REDIS_DB, decode_responses=True, ) log.info(f"Redis connection established in {sys.argv[0]}!") diff --git a/unraid_template/romm.xml b/unraid_template/romm.xml index c687a2cb5..09427bba2 100644 --- a/unraid_template/romm.xml +++ b/unraid_template/romm.xml @@ -39,7 +39,9 @@ - + + +