github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 19:29:48 +00:00
Code Issues Projects Releases Wiki Activity

fix: 哨兵redis 密码里有@ 无法连接

Browse Source
This commit is contained in:
feng
2024-02-29 16:06:26 +08:00
committed by Bryan
parent b557e264bc
commit f0ffa2408d
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/start_celery_beat.py
View File

@@ -19,9 +19,7 @@ os.environ.setdefault('PYTHONOPTIMIZE', '1')
if os.getuid() == 0:
os.environ.setdefault('C_FORCE_ROOT', '1')
connection_params = {
'password': settings.REDIS_PASSWORD,
}
connection_params = {}
if settings.REDIS_USE_SSL:
connection_params['ssl'] = settings.REDIS_USE_SSL
@@ -36,6 +34,7 @@ REDIS_SENTINEL_PASSWORD = settings.REDIS_SENTINEL_PASSWORD
REDIS_SENTINEL_SOCKET_TIMEOUT = settings.REDIS_SENTINEL_SOCKET_TIMEOUT
if REDIS_SENTINEL_SERVICE_NAME and REDIS_SENTINELS:
connection_params['sentinels'] = REDIS_SENTINELS
connection_params['password'] = settings.REDIS_PASSWORD
sentinel_client = Sentinel(
**connection_params, sentinel_kwargs={
'ssl': settings.REDIS_USE_SSL,
@@ -52,7 +51,7 @@ else:
REDIS_PROTOCOL = 'rediss' if settings.REDIS_USE_SSL else 'redis'
REDIS_LOCATION_NO_DB = '%(protocol)s://:%(password)s@%(host)s:%(port)s' % {
'protocol': REDIS_PROTOCOL,
'password': settings.REDIS_PASSWORD,
'password': settings.REDIS_PASSWORD_QUOTE,
'host': settings.REDIS_HOST,
'port': settings.REDIS_PORT,
}