Alerts: a delivery no channel took leaves the cooldown unspent
This commit is contained in:
@@ -306,8 +306,8 @@ class AlertManager:
|
||||
# Held back, not spent: the cooldown only starts once it is sent.
|
||||
self._suppressed[key] = self._suppressed.get(key, 0) + 1
|
||||
return
|
||||
previous = self._last_sent.get(key)
|
||||
now = self._stamp(key)
|
||||
await self._remember(key, now)
|
||||
|
||||
held = self._suppressed.pop(key, 0)
|
||||
if held:
|
||||
@@ -316,9 +316,19 @@ class AlertManager:
|
||||
)
|
||||
|
||||
names = {name for rule in rules for name in rule.channels}
|
||||
delivered = False
|
||||
for channel in self.config.channels:
|
||||
if channel.enabled and channel.name in names:
|
||||
await self.send(channel, alert)
|
||||
delivered = await self.send(channel, alert) or delivered
|
||||
if delivered:
|
||||
await self._remember(key, now)
|
||||
else:
|
||||
# Nobody heard it, so the next one tries again rather than wait
|
||||
# out a cooldown nothing started.
|
||||
if previous is None:
|
||||
self._last_sent.pop(key, None)
|
||||
else:
|
||||
self._last_sent[key] = previous
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Deciding whether to speak
|
||||
@@ -391,8 +401,8 @@ class AlertManager:
|
||||
|
||||
async def send(
|
||||
self, channel: Channel, alert: Alert, raise_on_error: bool = False
|
||||
) -> None:
|
||||
"""Deliver one alert.
|
||||
) -> bool:
|
||||
"""Deliver one alert, and say whether it went.
|
||||
|
||||
A failure is logged and swallowed, because one dead channel must not
|
||||
stop the others hearing about the same fault. The test button passes
|
||||
@@ -405,7 +415,7 @@ class AlertManager:
|
||||
if raise_on_error:
|
||||
raise
|
||||
logger.error("Channel '%s' has unusable settings: %s", channel.name, exc)
|
||||
return
|
||||
return False
|
||||
|
||||
try:
|
||||
if channel.kind == "ntfy":
|
||||
@@ -424,6 +434,8 @@ class AlertManager:
|
||||
if raise_on_error:
|
||||
raise
|
||||
logger.error("Could not alert through '%s': %s", channel.name, exc)
|
||||
return False
|
||||
return True
|
||||
|
||||
async def _send_ntfy(self, config: dict[str, Any], alert: Alert) -> None:
|
||||
server = str(config.get("server") or "https://ntfy.sh").rstrip("/")
|
||||
|
||||
Reference in New Issue
Block a user