From 06b82d5ee8ebf4ab122e20831fecec3842e6ba84 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 28 Mar 2025 12:19:28 +0100 Subject: [PATCH] Use configured Redis DB also in sentinel mode --- modoboa/policyd/core.py | 4 +++- modoboa/policyd/utils.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa/policyd/core.py b/modoboa/policyd/core.py index cf68abec7..c73071bfb 100644 --- a/modoboa/policyd/core.py +++ b/modoboa/policyd/core.py @@ -36,7 +36,9 @@ def get_redis_client(): return aioredis.from_url( settings.REDIS_URL, encoding="utf-8", decode_responses=True ) - sentinel = aioredis.sentinel.Sentinel(settings.REDIS_SENTINELS, socket_timeout=0.1) + sentinel = aioredis.sentinel.Sentinel( + settings.REDIS_SENTINELS, socket_timeout=0.1, db=settings.REDIS_QUOTA_DB + ) return sentinel.master_for(settings.REDIS_MASTER, socket_timeout=0.1) diff --git a/modoboa/policyd/utils.py b/modoboa/policyd/utils.py index 5c2a06b1b..868908a5f 100644 --- a/modoboa/policyd/utils.py +++ b/modoboa/policyd/utils.py @@ -16,7 +16,9 @@ def get_redis_connection(): db=settings.REDIS_QUOTA_DB, ) else: - sentinel = redis.sentinel.Sentinel(settings.REDIS_SENTINELS, socket_timeout=0.1) + sentinel = redis.sentinel.Sentinel( + settings.REDIS_SENTINELS, socket_timeout=0.1, db=settings.REDIS_QUOTA_DB + ) rclient = sentinel.master_for(settings.REDIS_MASTER, socket_timeout=0.1) rclient.set_response_callback("HGET", int) return rclient