a
This commit is contained in:
parent
4c20a7a488
commit
7fb0ed39a7
|
|
@ -130,7 +130,13 @@ class ConfigManager:
|
||||||
# 从环境变量获取SSL配置(如果未设置,使用默认值)
|
# 从环境变量获取SSL配置(如果未设置,使用默认值)
|
||||||
ssl_cert_reqs = os.getenv('REDIS_SSL_CERT_REQS', 'required')
|
ssl_cert_reqs = os.getenv('REDIS_SSL_CERT_REQS', 'required')
|
||||||
ssl_ca_certs = os.getenv('REDIS_SSL_CA_CERTS', None)
|
ssl_ca_certs = os.getenv('REDIS_SSL_CA_CERTS', None)
|
||||||
|
|
||||||
|
connection_kwargs['select'] = os.getenv('REDIS_SELECT', 0)
|
||||||
|
if connection_kwargs['select'] is not None:
|
||||||
|
connection_kwargs['select'] = int(connection_kwargs['select'])
|
||||||
|
else:
|
||||||
|
connection_kwargs['select'] = 0
|
||||||
|
logger.info(f"使用 Redis 数据库: {connection_kwargs['select']}")
|
||||||
# 设置SSL参数
|
# 设置SSL参数
|
||||||
connection_kwargs['ssl_cert_reqs'] = ssl_cert_reqs
|
connection_kwargs['ssl_cert_reqs'] = ssl_cert_reqs
|
||||||
if ssl_ca_certs:
|
if ssl_ca_certs:
|
||||||
|
|
|
||||||
|
|
@ -269,7 +269,7 @@ for key, value in defaults.items():
|
||||||
def reload_config():
|
def reload_config():
|
||||||
"""重新加载配置(供外部调用)"""
|
"""重新加载配置(供外部调用)"""
|
||||||
global TRADING_CONFIG, BINANCE_API_KEY, BINANCE_API_SECRET, USE_TESTNET, _config_manager, USE_DB_CONFIG
|
global TRADING_CONFIG, BINANCE_API_KEY, BINANCE_API_SECRET, USE_TESTNET, _config_manager, USE_DB_CONFIG
|
||||||
global REDIS_URL, REDIS_USE_TLS, REDIS_SSL_CERT_REQS, REDIS_SSL_CA_CERTS, REDIS_USERNAME, REDIS_PASSWORD
|
global REDIS_URL, REDIS_USE_TLS, REDIS_SSL_CERT_REQS, REDIS_SSL_CA_CERTS, REDIS_USERNAME, REDIS_PASSWORD, REDIS_SELECT
|
||||||
|
|
||||||
# 如果配置管理器不存在,尝试初始化
|
# 如果配置管理器不存在,尝试初始化
|
||||||
if _config_manager is None:
|
if _config_manager is None:
|
||||||
|
|
@ -305,6 +305,7 @@ def reload_config():
|
||||||
REDIS_SSL_CA_CERTS = _get_config_value('REDIS_SSL_CA_CERTS', REDIS_SSL_CA_CERTS)
|
REDIS_SSL_CA_CERTS = _get_config_value('REDIS_SSL_CA_CERTS', REDIS_SSL_CA_CERTS)
|
||||||
REDIS_USERNAME = _get_config_value('REDIS_USERNAME', os.getenv('REDIS_USERNAME', REDIS_USERNAME))
|
REDIS_USERNAME = _get_config_value('REDIS_USERNAME', os.getenv('REDIS_USERNAME', REDIS_USERNAME))
|
||||||
REDIS_PASSWORD = _get_config_value('REDIS_PASSWORD', os.getenv('REDIS_PASSWORD', REDIS_PASSWORD))
|
REDIS_PASSWORD = _get_config_value('REDIS_PASSWORD', os.getenv('REDIS_PASSWORD', REDIS_PASSWORD))
|
||||||
|
REDIS_SELECT = _get_config_value('REDIS_SELECT', os.getenv('REDIS_SELECT', REDIS_SELECT))
|
||||||
# 确保默认值
|
# 确保默认值
|
||||||
for key, value in defaults.items():
|
for key, value in defaults.items():
|
||||||
if key not in TRADING_CONFIG:
|
if key not in TRADING_CONFIG:
|
||||||
|
|
@ -321,6 +322,7 @@ REDIS_SSL_CERT_REQS = _get_config_value('REDIS_SSL_CERT_REQS', 'required')
|
||||||
REDIS_SSL_CA_CERTS = _get_config_value('REDIS_SSL_CA_CERTS', None)
|
REDIS_SSL_CA_CERTS = _get_config_value('REDIS_SSL_CA_CERTS', None)
|
||||||
REDIS_USERNAME = _get_config_value('REDIS_USERNAME', os.getenv('REDIS_USERNAME', None))
|
REDIS_USERNAME = _get_config_value('REDIS_USERNAME', os.getenv('REDIS_USERNAME', None))
|
||||||
REDIS_PASSWORD = _get_config_value('REDIS_PASSWORD', os.getenv('REDIS_PASSWORD', None))
|
REDIS_PASSWORD = _get_config_value('REDIS_PASSWORD', os.getenv('REDIS_PASSWORD', None))
|
||||||
|
REDIS_SELECT = _get_config_value('REDIS_SELECT', os.getenv('REDIS_SELECT', 0))
|
||||||
|
|
||||||
# 日志配置
|
# 日志配置
|
||||||
LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO')
|
LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user