refactor: define redis port as env variable

sparcs-kaist · Apr 5, 2024 · 30feb3c · 30feb3c
1 parent aa51697
commit 30feb3c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.docker/run-celery.sh b/.docker/run-celery.sh
@@ -9,7 +9,7 @@ done
 
 sleep 5
 
-while ! nc -vz $NEWARA_REDIS_ADDRESS 6379; do
+while ! nc -vz $NEWARA_REDIS_ADDRESS $NEWARA_REDIS_PORT; do
   >&2 echo "Redis is unavailable - sleeping"
   sleep 1
 done

diff --git a/.docker/run.sh b/.docker/run.sh
@@ -7,7 +7,7 @@ while ! nc -vz $NEWARA_DB_HOST $NEWARA_DB_PORT; do
   sleep 1
 done
 
-while ! nc -vz $NEWARA_REDIS_ADDRESS 6379; do
+while ! nc -vz $NEWARA_REDIS_ADDRESS $NEWARA_REDIS_PORT; do
   >&2 echo "Redis is unavailable - sleeping"
   sleep 1
 done

diff --git a/ara/settings/cacheops.py b/ara/settings/cacheops.py
@@ -1,8 +1,8 @@
-from .redis import REDIS_HOST
+from .redis import REDIS_HOST, REDIS_PORT
 
 CACHEOPS_REDIS = {
     "host": REDIS_HOST,
-    "port": 6379,
+    "port": REDIS_PORT,
     "db": 1,
 }
 

diff --git a/ara/settings/redis.py b/ara/settings/redis.py
@@ -2,8 +2,10 @@
 from os import environ as os_environ
 
 REDIS_HOST = os_environ.get("NEWARA_REDIS_ADDRESS", "localhost")
+REDIS_PORT = os_environ.get("NEWARA_REDIS_PORT", 6379)
 REDIS_DATABASE = int(os_environ.get("NEWARA_REDIS_DATABASE", 0))
-REDIS_URL = f"redis://{REDIS_HOST}:6379/{REDIS_DATABASE}"
+
+REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_DATABASE}"
 
 CACHES_TIMEOUT = timedelta(days=14)
 

diff --git a/ara/settings/test.py b/ara/settings/test.py
@@ -24,7 +24,7 @@
 }
 
 REDIS_DATABASE = int(environ.get("NEWARA_REDIS_DATABASE", 2))
-REDIS_URL = f"redis://{REDIS_HOST}:6379/{REDIS_DATABASE}"
+REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_DATABASE}"
 
 CELERY_TASK_ALWAYS_EAGER = True
 ELASTICSEARCH_INDEX_NAME = "articles_test"