mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-18 09:53:56 +01:00
Merge branch '2.3.x'
This commit is contained in:
+19
-16
@@ -31,6 +31,15 @@ SUCCESS_ACTION = b"dunno"
|
||||
FAILURE_ACTION = b"defer_if_permit Daily limit reached, retry later"
|
||||
|
||||
|
||||
def get_redis_client():
|
||||
if not getattr(settings, "REDIS_SENTINEL", False):
|
||||
return aioredis.from_url(
|
||||
settings.REDIS_URL, encoding="utf-8", decode_responses=True
|
||||
)
|
||||
sentinel = aioredis.sentinel.Sentinel(settings.REDIS_SENTINELS, socket_timeout=0.1)
|
||||
return sentinel.master_for(settings.REDIS_MASTER, socket_timeout=0.1)
|
||||
|
||||
|
||||
def close_db_connections(func, *args, **kwargs):
|
||||
"""
|
||||
Make sure to close all connections to DB.
|
||||
@@ -144,9 +153,7 @@ async def apply_policies(attributes):
|
||||
sasl_username = attributes.get("sasl_username")
|
||||
if not sasl_username:
|
||||
return SUCCESS_ACTION
|
||||
rclient = aioredis.from_url(
|
||||
settings.REDIS_URL, encoding="utf-8", decode_responses=True
|
||||
)
|
||||
rclient = get_redis_client()
|
||||
decr_domain = False
|
||||
decr_user = False
|
||||
localpart, domain = split_mailbox(sasl_username)
|
||||
@@ -200,16 +207,14 @@ async def handle_connection(reader, writer):
|
||||
|
||||
|
||||
async def new_connection(reader, writer):
|
||||
try:
|
||||
await asyncio.wait_for(handle_connection(reader, writer), timeout=5)
|
||||
except asyncio.TimeoutError as err:
|
||||
logger.warning("Timeout received while handling connection: %s", err)
|
||||
finally:
|
||||
writer.close()
|
||||
if hasattr(writer, "wait_closed"):
|
||||
# Python 3.7+ only
|
||||
await writer.wait_closed()
|
||||
logger.info("exit")
|
||||
# try:
|
||||
await asyncio.wait_for(handle_connection(reader, writer), timeout=5)
|
||||
# except asyncio.TimeoutError as err:
|
||||
# logger.warning(f"Timeout received while handling connection: {err}")
|
||||
# finally:
|
||||
writer.close()
|
||||
await writer.wait_closed()
|
||||
logger.info("exit")
|
||||
|
||||
|
||||
def get_next_execution_dt():
|
||||
@@ -255,9 +260,7 @@ def get_mailboxes_to_reset():
|
||||
|
||||
async def reset_counters():
|
||||
"""Reset all counters."""
|
||||
rclient = aioredis.from_url(
|
||||
settings.REDIS_URL, encoding="utf-8", decode_responses=True
|
||||
)
|
||||
rclient = get_redis_client()
|
||||
logger.info("Resetting all counters")
|
||||
for domain in await get_domains_to_reset():
|
||||
await rclient.hset(constants.REDIS_HASHNAME, domain.name, domain.message_limit)
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
"""App related signal handlers."""
|
||||
|
||||
import redis
|
||||
|
||||
from django.conf import settings
|
||||
from django.db.models import signals
|
||||
from django.dispatch import receiver
|
||||
|
||||
from modoboa.admin import models as admin_models
|
||||
|
||||
from . import constants
|
||||
from . import utils
|
||||
|
||||
|
||||
def set_message_limit(instance, key):
|
||||
@@ -16,9 +14,7 @@ def set_message_limit(instance, key):
|
||||
old_message_limit = instance._loaded_values.get("message_limit")
|
||||
if old_message_limit == instance.message_limit:
|
||||
return
|
||||
rclient = redis.Redis(
|
||||
host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=settings.REDIS_QUOTA_DB
|
||||
)
|
||||
rclient = utils.get_redis_connection()
|
||||
if instance.message_limit is None:
|
||||
# delete existing key
|
||||
if rclient.hexists(constants.REDIS_HASHNAME, key):
|
||||
|
||||
@@ -7,10 +7,8 @@ from multiprocessing import Process
|
||||
import socket
|
||||
import time
|
||||
|
||||
import redis
|
||||
|
||||
from django import db
|
||||
from django.conf import settings
|
||||
from django.core.management import call_command
|
||||
from django.test import TransactionTestCase
|
||||
from django.urls import reverse
|
||||
@@ -22,6 +20,7 @@ from modoboa.lib.tests import ModoTestCase, ParametersMixin
|
||||
from modoboa.policyd import core as policyd_core
|
||||
|
||||
from . import constants
|
||||
from . import utils
|
||||
|
||||
|
||||
def start_policy_daemon():
|
||||
@@ -33,12 +32,7 @@ class RedisTestCaseMixin:
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.rclient = redis.Redis(
|
||||
host=settings.REDIS_HOST,
|
||||
port=settings.REDIS_PORT,
|
||||
db=settings.REDIS_QUOTA_DB,
|
||||
)
|
||||
self.rclient.set_response_callback("HGET", int)
|
||||
self.rclient = utils.get_redis_connection()
|
||||
self.rclient.delete(constants.REDIS_HASHNAME)
|
||||
|
||||
|
||||
|
||||
@@ -9,9 +9,15 @@ from . import constants
|
||||
|
||||
def get_redis_connection():
|
||||
"""Return a client connection to Redis server."""
|
||||
rclient = redis.Redis(
|
||||
host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=settings.REDIS_QUOTA_DB
|
||||
)
|
||||
if not getattr(settings, "REDIS_SENTINEL", False):
|
||||
rclient = redis.Redis(
|
||||
host=settings.REDIS_HOST,
|
||||
port=settings.REDIS_PORT,
|
||||
db=settings.REDIS_QUOTA_DB,
|
||||
)
|
||||
else:
|
||||
sentinel = redis.sentinel.Sentinel(settings.REDIS_SENTINELS, socket_timeout=0.1)
|
||||
rclient = sentinel.master_for(settings.REDIS_MASTER, socket_timeout=0.1)
|
||||
rclient.set_response_callback("HGET", int)
|
||||
return rclient
|
||||
|
||||
|
||||
Reference in New Issue
Block a user