From d9ee525218a25522336be97cd70efcd481d044cf Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 13 Feb 2024 13:05:41 +0100 Subject: [PATCH] don't take the redis fail case --- modoboa/core/app_settings.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index c2804e1df..17a41bd68 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -8,11 +8,6 @@ from django.conf import settings from django.contrib.auth import password_validation from django.utils.translation import gettext as _, gettext_lazy -from redis.exceptions import ConnectionError - -from modoboa.admin.models import Alarm -from modoboa.admin.constants import REDIS_ALARM, ALARM_OPENED - from modoboa.core.password_hashers.utils import cache_available_password_hasher from modoboa.lib import fields as lib_fields from modoboa.lib.form_utils import ( @@ -37,19 +32,10 @@ def enabled_applications(): def get_password_scheme(): - try: - available_schemes = cache.get("password_scheme_choice") - if available_schemes is None: - available_schemes = cache_available_password_hasher() - return available_schemes - except ConnectionError: - redis_alarm = Alarm.objects.filter(internal_name=REDIS_ALARM) - if redis_alarm.first() is None: - Alarm.objects.create(internal_name=REDIS_ALARM, - title="Redis seems misconfigured") - elif redis_alarm.first().status == ALARM_OPENED: - redis_alarm.first().reopen() - return cache_available_password_hasher(bypass_cache=True) + available_schemes = cache.get("password_scheme_choice") + if available_schemes is None: + available_schemes = cache_available_password_hasher() + return available_schemes class GeneralParametersForm(param_forms.AdminParametersForm):