Доведен до ума и стабилизирован модуль ZFS

modules/logger.py

@@ -43,6 +43,10 @@ class TelegramHandler(logging.Handler):
     def __init__(self, config: Dict[str, Any]) -> None:
         super().__init__()
         self._config = config
+        self._suppress_levels: List[str] = []
+        batch = config.get("batch_notifications", {})
+        if batch.get("enabled"):
+            self._suppress_levels = [str(x).upper() for x in batch.get("suppress_individual_logs", [])]
         self._queue: queue.Queue = queue.Queue(maxsize=1000)
         self._bot_token = config.get("bot_token", "")
         self._chat_id = str(config.get("chat_id", ""))
@@ -70,11 +74,13 @@ class TelegramHandler(logging.Handler):
     def emit(self, record: logging.LogRecord) -> None:
         if not self._bot_token or not self._chat_id:
             return
+        levelname = str(getattr(record, "levelname", record.levelname)).upper()
+        if self._suppress_levels and levelname in self._suppress_levels:
+            return
         if not self._level_allowed(record):
             return
         try:
             msg = self.format(record)
-            # Экранируем HTML при parse_mode=HTML
             if self._parse_mode == "HTML":
                 msg = msg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
             self._queue.put_nowait(msg)
@@ -183,11 +189,68 @@ class TelegramHandler(logging.Handler):
                 return True
         return False
 
+    def flush(self, timeout: float = 15.0) -> None:
+        """Дождаться отправки всех сообщений из очереди перед выходом программы."""
+        deadline = time.monotonic() + timeout
+        while not self._queue.empty() and time.monotonic() < deadline:
+            time.sleep(0.2)
+        self._stop.set()
+        self._worker.join(timeout=5.0)
+
     def close(self) -> None:
         self._stop.set()
         super().close()
 
 
+def flush_telegram_handlers(timeout: float = 15.0) -> None:
+    """Ожидание отправки всех сообщений в Telegram перед выходом (вызывать в конце main)."""
+    root = logging.getLogger(ROOT_LOGGER_NAME)
+    for h in root.handlers:
+        if isinstance(h, TelegramHandler):
+            h.flush(timeout=timeout)
+
+
+def send_batch_notification(telegram_config: Optional[Dict[str, Any]], text: str) -> None:
+    """
+    Отправить структурированное batch-сообщение напрямую в Telegram (PRD v1.9).
+    Не идёт через очередь, отправка синхронная с retry.
+    """
+    if not telegram_config or not telegram_config.get("enabled"):
+        return
+    token = telegram_config.get("bot_token")
+    chat_id = telegram_config.get("chat_id")
+    if not token or not chat_id:
+        return
+    retry_cfg = telegram_config.get("retry", {})
+    attempts = retry_cfg.get("attempts", 3)
+    delay = retry_cfg.get("delay", 5)
+    opts = telegram_config.get("options", {})
+    parse_mode = opts.get("parse_mode", "HTML")
+    max_len = opts.get("max_message_length", 4096)
+    if parse_mode == "HTML":
+        text = text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+    parts = [text[i : i + max_len] for i in range(0, len(text), max_len)] if len(text) > max_len else [text]
+    import requests
+    url = f"https://api.telegram.org/bot{token}/sendMessage"
+    for part in parts:
+        for attempt in range(1, attempts + 1):
+            try:
+                resp = requests.post(
+                    url,
+                    data={"chat_id": chat_id, "text": part, "parse_mode": parse_mode},
+                    timeout=10,
+                )
+                resp.raise_for_status()
+                if not resp.json().get("ok"):
+                    raise RuntimeError(resp.json().get("description", "Unknown"))
+                break
+            except Exception as e:
+                if attempt == attempts:
+                    sys.stderr.write(f"[send_batch_notification] Не удалось отправить: {e}\n")
+                    return
+                time.sleep(delay)
+
+
 def _parse_level(level: str) -> int:
     m = {
         "DEBUG": logging.DEBUG,