From 9e71bb6e29d41a3dc3dca56c52e6eaac64de31cb Mon Sep 17 00:00:00 2001 From: "Nick V. Anokhin" Date: Sun, 19 Jul 2026 20:45:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D1=81=D0=BB=D1=83=D0=B6=D0=B5=D0=B1=D0=BD=D1=8B=D1=85=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net/xeaf/rack/managers/__init__.py | 1 - net/xeaf/rack/managers/session_manager.py | 6 +++--- net/xeaf/rack/utils/settings/__init__.py | 1 + .../configuration_manager.py => utils/settings/config.py} | 8 ++++---- .../utils/settings/{logger => configs/filter}/__init__.py | 4 ++-- .../filter/custom_logger_debug_filter.py} | 4 ++-- net/xeaf/rack/utils/settings/configs/logging.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename net/xeaf/rack/{managers/configuration_manager.py => utils/settings/config.py} (87%) rename net/xeaf/rack/utils/settings/{logger => configs/filter}/__init__.py (63%) rename net/xeaf/rack/utils/settings/{logger/log_debug_filter.py => configs/filter/custom_logger_debug_filter.py} (88%) diff --git a/net/xeaf/rack/managers/__init__.py b/net/xeaf/rack/managers/__init__.py index 0fd71a8..7957049 100644 --- a/net/xeaf/rack/managers/__init__.py +++ b/net/xeaf/rack/managers/__init__.py @@ -9,7 +9,6 @@ """ from .account_manager import AccountManager -from .configuration_manager import ConfigurationManager from .crypto_manager import CryptoManager from .locale_manager import LocaleManager from .request_manager import RequestManager diff --git a/net/xeaf/rack/managers/session_manager.py b/net/xeaf/rack/managers/session_manager.py index 8a08c25..b3010b6 100644 --- a/net/xeaf/rack/managers/session_manager.py +++ b/net/xeaf/rack/managers/session_manager.py @@ -16,12 +16,12 @@ from django.contrib.auth import authenticate from environ import ImproperlyConfigured from net.xeaf.rack.enums import AuthRejectReason -from net.xeaf.rack.managers import ConfigurationManager from net.xeaf.rack.managers import CryptoManager from net.xeaf.rack.models import AccountModel from net.xeaf.rack.models import SessionModel from net.xeaf.rack.utils.exceptions import UnauthorizedException from .account_manager import AccountManager +from ..utils.settings import Config class SessionManager[T:SessionModel]: @@ -116,7 +116,7 @@ class SessionManager[T:SessionModel]: :param session: Модель данных сессии """ - ttl = ConfigurationManager.get_int("SESSION_TTL", cls.DEFAULT_SESSION_TTL) + ttl = Config.get_int("SESSION_TTL", cls.DEFAULT_SESSION_TTL) session.renew(ttl, save=True) @classmethod @@ -144,7 +144,7 @@ class SessionManager[T:SessionModel]: """ if cls.__model_class is None: - model_path = ConfigurationManager.get_string("AUTH_SESSION_MODEL", "net_xeaf_rack.SessionModel") + model_path = Config.get_str("AUTH_SESSION_MODEL", "net_xeaf_rack.SessionModel") app_label, model_name = model_path.split(".") try: diff --git a/net/xeaf/rack/utils/settings/__init__.py b/net/xeaf/rack/utils/settings/__init__.py index 97ff973..0abe462 100644 --- a/net/xeaf/rack/utils/settings/__init__.py +++ b/net/xeaf/rack/utils/settings/__init__.py @@ -8,5 +8,6 @@ Пакет классов работы с параметрами конфигурации """ +from .config import Config from .environment import Environment from .setting_utils import SettingUtils diff --git a/net/xeaf/rack/managers/configuration_manager.py b/net/xeaf/rack/utils/settings/config.py similarity index 87% rename from net/xeaf/rack/managers/configuration_manager.py rename to net/xeaf/rack/utils/settings/config.py index 1e36fed..f63d61b 100644 --- a/net/xeaf/rack/managers/configuration_manager.py +++ b/net/xeaf/rack/utils/settings/config.py @@ -5,7 +5,7 @@ # Все права защищены. Лицензия: MIT """ -Описание класса ConfigurationManager +Описание класса Config """ from typing import Any @@ -14,13 +14,13 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured -class ConfigurationManager: +class Config: """ - Прокси-менеджер для безопасного извлечения настроек из django.conf.settings + Реализует методы для безопасного извлечения настроек из django.conf.settings """ @classmethod - def get_string(cls, key: str, default: str) -> str: + def get_str(cls, key: str, default: str) -> str: """ Извлекает строковое значение, параметр default обязателен """ diff --git a/net/xeaf/rack/utils/settings/logger/__init__.py b/net/xeaf/rack/utils/settings/configs/filter/__init__.py similarity index 63% rename from net/xeaf/rack/utils/settings/logger/__init__.py rename to net/xeaf/rack/utils/settings/configs/filter/__init__.py index ce9d698..89bd25f 100644 --- a/net/xeaf/rack/utils/settings/logger/__init__.py +++ b/net/xeaf/rack/utils/settings/configs/filter/__init__.py @@ -5,7 +5,7 @@ # Все права защищены. Лицензия: MIT """ -Пакет классов логгера +Пакет описания классов фильтрации логов """ -from .log_debug_filter import LogDebugFilter +from .custom_logger_debug_filter import CustomLoggerDebugFilter diff --git a/net/xeaf/rack/utils/settings/logger/log_debug_filter.py b/net/xeaf/rack/utils/settings/configs/filter/custom_logger_debug_filter.py similarity index 88% rename from net/xeaf/rack/utils/settings/logger/log_debug_filter.py rename to net/xeaf/rack/utils/settings/configs/filter/custom_logger_debug_filter.py index 504fb3a..1992f41 100644 --- a/net/xeaf/rack/utils/settings/logger/log_debug_filter.py +++ b/net/xeaf/rack/utils/settings/configs/filter/custom_logger_debug_filter.py @@ -5,13 +5,13 @@ # Все права защищены. Лицензия: MIT """ -Описание класса LogDebugFilter +Описание класса CustomLoggerDebugFilter """ from django.conf import settings -class LogDebugFilter: +class CustomLoggerDebugFilter: """ Фильтр для разделения журнала DEBUG """ diff --git a/net/xeaf/rack/utils/settings/configs/logging.py b/net/xeaf/rack/utils/settings/configs/logging.py index 53426b1..ba85d25 100644 --- a/net/xeaf/rack/utils/settings/configs/logging.py +++ b/net/xeaf/rack/utils/settings/configs/logging.py @@ -10,7 +10,7 @@ from net.xeaf.rack.utils.settings import Environment from net.xeaf.rack.utils.settings import SettingUtils -from net.xeaf.rack.utils.settings.logger import LogDebugFilter +from net.xeaf.rack.utils.settings.configs.filter import CustomLoggerDebugFilter # # Имя журнала @@ -47,7 +47,7 @@ LOGGING = { "filters": { "strict_debug_only": { - "()": LogDebugFilter, + "()": CustomLoggerDebugFilter, }, },