a
This commit is contained in:
parent
db953471b3
commit
be8b24575b
|
|
@ -77,8 +77,6 @@ class ConfigManager:
|
||||||
redis_username = os.getenv('REDIS_USERNAME', None)
|
redis_username = os.getenv('REDIS_USERNAME', None)
|
||||||
redis_password = os.getenv('REDIS_PASSWORD', None)
|
redis_password = os.getenv('REDIS_PASSWORD', None)
|
||||||
|
|
||||||
<<<<<<< Current (Your changes)
|
|
||||||
=======
|
|
||||||
# 验证URL格式
|
# 验证URL格式
|
||||||
if not redis_url or not isinstance(redis_url, str):
|
if not redis_url or not isinstance(redis_url, str):
|
||||||
logger.warning(f"Redis URL无效: {redis_url},使用默认值")
|
logger.warning(f"Redis URL无效: {redis_url},使用默认值")
|
||||||
|
|
@ -101,7 +99,6 @@ class ConfigManager:
|
||||||
redis_url = f"rediss://{redis_url}"
|
redis_url = f"rediss://{redis_url}"
|
||||||
logger.info(f"已自动转换Redis URL为TLS格式: {redis_url}")
|
logger.info(f"已自动转换Redis URL为TLS格式: {redis_url}")
|
||||||
|
|
||||||
>>>>>>> Incoming (Background Agent changes)
|
|
||||||
# 解析Redis URL
|
# 解析Redis URL
|
||||||
if redis_url.startswith('rediss://') or redis_use_tls:
|
if redis_url.startswith('rediss://') or redis_use_tls:
|
||||||
# TLS连接
|
# TLS连接
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user