highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-27 20:38:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

ssl_ca_certs should default to None, not "". (#2560)

Browse Source 
* ssl_ca_certs should default to None, not "".

otherwise, if ssl is enabled it will look for the cert on an empty path and fail.

* mypy fix
This commit is contained in:
rkuo-danswer
2024-09-25 12:56:21 -07:00
committed by GitHub
parent be50ae1e71
commit 166514cedf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/danswer/configs/app_configs.py
View File

@@ -167,7 +167,7 @@ REDIS_DB_NUMBER_CELERY = int(os.environ.get("REDIS_DB_NUMBER_CELERY", 15)) # br
# https://docs.celeryq.dev/en/stable/userguide/configuration.html#redis-backend-settings # https://docs.celeryq.dev/en/stable/userguide/configuration.html#redis-backend-settings
# should be one of "required", "optional", or "none" # should be one of "required", "optional", or "none"
REDIS_SSL_CERT_REQS = os.getenv("REDIS_SSL_CERT_REQS", "none") REDIS_SSL_CERT_REQS = os.getenv("REDIS_SSL_CERT_REQS", "none")
REDIS_SSL_CA_CERTS = os.getenv("REDIS_SSL_CA_CERTS", "") REDIS_SSL_CA_CERTS = os.getenv("REDIS_SSL_CA_CERTS", None)
CELERY_RESULT_EXPIRES = int(os.environ.get("CELERY_RESULT_EXPIRES", 86400)) # seconds CELERY_RESULT_EXPIRES = int(os.environ.get("CELERY_RESULT_EXPIRES", 86400)) # seconds

2
backend/danswer/redis/redis_pool.py
View File

@@ -42,7 +42,7 @@ class RedisPool:
db: int = REDIS_DB_NUMBER, db: int = REDIS_DB_NUMBER,
password: str = REDIS_PASSWORD, password: str = REDIS_PASSWORD,
max_connections: int = REDIS_POOL_MAX_CONNECTIONS, max_connections: int = REDIS_POOL_MAX_CONNECTIONS,
ssl_ca_certs: str = REDIS_SSL_CA_CERTS, ssl_ca_certs: str | None = REDIS_SSL_CA_CERTS,
ssl_cert_reqs: str = REDIS_SSL_CERT_REQS, ssl_cert_reqs: str = REDIS_SSL_CERT_REQS,
ssl: bool = False, ssl: bool = False,
) -> redis.ConnectionPool: ) -> redis.ConnectionPool: