public/tubearchivist
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/tubearchivist.git synced 2026-08-04 23:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

use REDIS_CON for redis connection string

Browse Source
This commit is contained in:
Simon
2024-12-23 22:29:52 +07:00
parent f25c2025e8
commit a4435fdd60
7 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/common/src/env_settings.py
View File

@@ -37,8 +37,7 @@ class EnvironmentSettings:
CACHE_DIR: str = str(environ.get("TA_CACHE_DIR", "/cache"))
# Redis
REDIS_HOST: str = str(environ.get("REDIS_HOST"))
REDIS_PORT: int = int(environ.get("REDIS_PORT", 6379))
REDIS_CON: str = str(environ.get("REDIS_CON"))
REDIS_NAME_SPACE: str = str(environ.get("REDIS_NAME_SPACE", "ta:"))
# ElasticSearch
@@ -93,8 +92,7 @@ class EnvironmentSettings:
"""debug redis conf paths"""
print(
f"""
REDIS_HOST: {self.REDIS_HOST}
REDIS_PORT: {self.REDIS_PORT}
REDIS_CON: {self.REDIS_CON}
REDIS_NAME_SPACE: {self.REDIS_NAME_SPACE}"""
)

6
backend/common/src/ta_redis.py
View File

@@ -17,10 +17,8 @@ class RedisBase:
NAME_SPACE: str = EnvironmentSettings.REDIS_NAME_SPACE
def __init__(self):
self.conn = redis.Redis(
host=EnvironmentSettings.REDIS_HOST,
port=EnvironmentSettings.REDIS_PORT,
decode_responses=True,
self.conn = redis.from_url(
url=EnvironmentSettings.REDIS_CON, decode_responses=True
)

4
backend/config/management/commands/ta_envcheck.py
View File

@@ -62,7 +62,9 @@ EXPECTED_ENV_VARS = [
"TA_HOST",
]
UNEXPECTED_ENV_VARS = {
"TA_UWSGI_PORT": "Has been replaced with 'TA_BACKEND_PORT'"
"TA_UWSGI_PORT": "Has been replaced with 'TA_BACKEND_PORT'",
"REDIS_HOST": "Has been replaced with 'REDIS_CON' connection string",
"REDIS_PORT": "Has been consolidated in 'REDIS_CON' connection string",
}
INST = "https://github.com/tubearchivist/tubearchivist#installing-and-updating"
NGINX = "/etc/nginx/sites-available/default"

7
backend/task/celery.py
View File

@@ -5,14 +5,11 @@ import os
from celery import Celery
from common.src.env_settings import EnvironmentSettings
REDIS_HOST = EnvironmentSettings.REDIS_HOST
REDIS_PORT = EnvironmentSettings.REDIS_PORT
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
app = Celery(
"tasks",
broker=f"redis://{REDIS_HOST}:{REDIS_PORT}",
backend=f"redis://{REDIS_HOST}:{REDIS_PORT}",
broker=EnvironmentSettings.REDIS_CON,
backend=EnvironmentSettings.REDIS_CON,
result_extended=True,
)
app.config_from_object(