chore: commit local changes

backend/app/services/jail_config_service.py

@@ -30,7 +30,13 @@ from app.models.config import (
     JailValidationResult,
     RollbackResponse,
 )
-from app.services import config_file_service, jail_service
+from app.utils.config_file_utils import (
+    _build_inactive_jail,
+    _ordered_config_files,
+    _parse_jails_sync,
+    _validate_jail_config_sync,
+)
+from app.utils.jail_utils import reload_jails
 from app.utils.fail2ban_client import (
     Fail2BanClient,
     Fail2BanConnectionError,
@@ -304,7 +310,7 @@ def _validate_regex_patterns(patterns: list[str]) -> None:
             re.compile(pattern)
         except re.error as exc:
             # Import here to avoid circular dependency
-            from app.services.filter_config_service import FilterInvalidRegexError
+            from app.exceptions import FilterInvalidRegexError
             raise FilterInvalidRegexError(pattern, str(exc)) from exc
 
 
@@ -460,12 +466,7 @@ async def start_daemon(start_cmd_parts: list[str]) -> bool:
         return False
 
 
-# Import shared functions from config_file_service
-_parse_jails_sync = config_file_service._parse_jails_sync
-_build_inactive_jail = config_file_service._build_inactive_jail
-_get_active_jail_names = config_file_service._get_active_jail_names
-_validate_jail_config_sync = config_file_service._validate_jail_config_sync
-_orderedconfig_files = config_file_service._ordered_config_files
+# Shared functions from config_file_service are imported from app.utils.config_file_utils
 
 
 # ---------------------------------------------------------------------------
@@ -624,7 +625,7 @@ async def activate_jail(
     # Activation reload — if it fails, roll back immediately                  #
     # ---------------------------------------------------------------------- #
     try:
-        await jail_service.reload_all(socket_path, include_jails=[name])
+        await reload_jails(socket_path, include_jails=[name])
     except JailNotFoundError as exc:
         # Jail configuration is invalid (e.g. missing logpath that prevents
         # fail2ban from loading the jail). Roll back and provide a specific error.
@@ -767,7 +768,7 @@ async def _rollback_activation_async(
 
     # Step 2 — reload fail2ban with the restored config.
     try:
-        await jail_service.reload_all(socket_path)
+        await reload_jails(socket_path)
         log.info("jail_activation_rollback_reload_ok", jail=name)
     except Exception as exc:  # noqa: BLE001
         log.warning("jail_activation_rollback_reload_failed", jail=name, error=str(exc))
@@ -834,7 +835,7 @@ async def deactivate_jail(
     )
 
     try:
-        await jail_service.reload_all(socket_path, exclude_jails=[name])
+        await reload_jails(socket_path, exclude_jails=[name])
     except Exception as exc:  # noqa: BLE001
         log.warning("reload_after_deactivate_failed", jail=name, error=str(exc))