Backup automatico script del 2026-07-26 07:00
This commit is contained in:
1 parent
4802b021fe
commit
a9bbb92090
19 files changed
+1086
-550
No files matched your search
@@ -273,15 +273,12 @@ def telegram_send_html(message_html: str, chat_ids: Optional[List[str]] = None)
|
||||
chat_ids: Lista di chat IDs (default: TELEGRAM_CHAT_IDS)
|
||||
"""
|
||||
try:
|
||||
from telegram_gate import mirror_alert_to_web, telegram_alerts_enabled
|
||||
from telegram_gate import telegram_alerts_enabled
|
||||
except ImportError:
|
||||
telegram_alerts_enabled = lambda: True # type: ignore
|
||||
mirror_alert_to_web = lambda *a, **k: False # type: ignore
|
||||
|
||||
if not telegram_alerts_enabled():
|
||||
LOGGER.info("Telegram sospeso: skip severe_weather")
|
||||
if message_html:
|
||||
mirror_alert_to_web(message_html, "severe_weather", "warning", is_html=True)
|
||||
return False
|
||||
|
||||
token = load_bot_token()
|
||||
@@ -315,15 +312,6 @@ def telegram_send_html(message_html: str, chat_ids: Optional[List[str]] = None)
|
||||
except Exception as e:
|
||||
LOGGER.exception("Telegram exception chat_id=%s err=%s", chat_id, e)
|
||||
|
||||
if sent_ok:
|
||||
try:
|
||||
import sys
|
||||
sys.path.insert(0, "/home/daniely/docker/shared")
|
||||
from loogle_core.alert_dispatcher import mirror_to_web
|
||||
mirror_to_web(message_html, "severe_weather", "warning", is_html=True)
|
||||
except Exception as e:
|
||||
LOGGER.debug("Web dispatch failed: %s", e)
|
||||
|
||||
return sent_ok
|
||||
|
||||
|
||||
@@ -1859,10 +1847,7 @@ def analyze(chat_ids: Optional[List[str]] = None, debug_mode: bool = False, lat:
|
||||
msg = f"{headline}\n{meta}\n{body}{footer}"
|
||||
|
||||
ok = telegram_send_html(msg, chat_ids=chat_ids)
|
||||
if ok:
|
||||
LOGGER.info("Alert sent successfully.")
|
||||
else:
|
||||
LOGGER.warning("Alert NOT sent (token missing or Telegram error).")
|
||||
web_ok = False
|
||||
|
||||
# IMPORTANTE: Imposta alert_active = True solo se c'è una vera allerta,
|
||||
# non se è solo un messaggio informativo in modalità debug
|
||||
@@ -1879,10 +1864,23 @@ def analyze(chat_ids: Optional[List[str]] = None, debug_mode: bool = False, lat:
|
||||
state["alert_active"] = True
|
||||
state["last_alert_type"] = alert_types if alert_types else None
|
||||
state["last_alert_time"] = now.isoformat()
|
||||
if ok:
|
||||
try:
|
||||
from webapp_alert import publish_web_alert
|
||||
web_ok = bool(publish_web_alert(msg, "severe_weather", "warning", is_html=True, state=state))
|
||||
except Exception as e:
|
||||
LOGGER.debug("Web summary failed: %s", e)
|
||||
if ok or web_ok:
|
||||
record_notify_message(now, state, alert_signature)
|
||||
save_state(state)
|
||||
|
||||
if ok:
|
||||
LOGGER.info("Alert sent successfully (Telegram).")
|
||||
elif web_ok:
|
||||
LOGGER.info("Alert published on WebApp.")
|
||||
else:
|
||||
LOGGER.warning("Alert NOT delivered (Telegram/WebApp).")
|
||||
|
||||
if debug_message_only:
|
||||
# In debug mode senza vere allerte, non modificare alert_active
|
||||
LOGGER.debug("[DEBUG MODE] Messaggio inviato ma alert_active non modificato (nessuna vera allerta)")
|
||||
return
|
||||
@@ -1942,7 +1940,7 @@ def analyze(chat_ids: Optional[List[str]] = None, debug_mode: bool = False, lat:
|
||||
if ok:
|
||||
LOGGER.info("All-clear sent successfully.")
|
||||
else:
|
||||
LOGGER.warning("All-clear NOT sent (token missing or Telegram error).")
|
||||
LOGGER.info("All-clear Telegram skip/fail (WebApp primaria se attiva).")
|
||||
|
||||
state = {
|
||||
"alert_active": False,
|
||||
|
||||
Reference in new issue
Block a user