Refactor app helpers and use AppStateDep in config router

Move service-dependent helper wrappers from app.utils to app.helpers and update config router activation/rollback to use explicit AppState dependency.
This commit is contained in:
2026-04-07 20:39:56 +02:00
parent ed3aa61c35
commit 1e39e5a1d6
11 changed files with 98 additions and 30 deletions

View File

@@ -21,6 +21,13 @@ from typing import cast
import structlog
from app.exceptions import JailNotFoundError
from app.helpers.config_file_helpers import (
_build_inactive_jail,
_get_active_jail_names,
_parse_jails_sync,
_validate_jail_config_sync,
)
from app.helpers.jail_helpers import reload_jails
from app.models.config import (
ActivateJailRequest,
InactiveJail,
@@ -29,14 +36,7 @@ from app.models.config import (
JailValidationResult,
RollbackResponse,
)
from app.utils.config_file_utils import (
_build_inactive_jail,
_get_active_jail_names,
_parse_jails_sync,
_validate_jail_config_sync,
)
from app.utils.fail2ban_client import Fail2BanClient
from app.utils.jail_utils import reload_jails
log: structlog.stdlib.BoundLogger = structlog.get_logger()
@@ -461,7 +461,7 @@ async def start_daemon(start_cmd_parts: list[str]) -> bool:
return False
# Shared functions from config_file_service are imported from app.utils.config_file_utils
# Shared functions from config_file_service are imported from app.helpers.config_file_helpers
# ---------------------------------------------------------------------------