Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix how delayed events are sent/resolved #78

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fix how delayed events are sent/resolved #78

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca6317
fix how delayed events are sent/resolved
ayazabbas Jun 13, 2024
2c87ca5
bump version
ayazabbas Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions pyth_observer/dispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,10 @@ async def run(self, states: List[State]):
"failures": 1,
"last_window_failures": None,
"sent": False,
"event_type": event_type,
}
else:
alert["failures"] += 1
self.delayed_events[alert_identifier] = event
self.delayed_events[f"{event_type}-{alert_identifier}"] = event
continue # Skip sending immediately for ZendutyEvent or TelegramEvent

sent_events.append(event.send())
Expand Down Expand Up @@ -188,10 +187,7 @@ async def process_zenduty_events(self, current_time):
):
logger.debug(f"Resolving Zenduty alert {identifier}")
resolved = True
if (
info["sent"]
and info.get("event_type", "ZendutyEvent") == "ZendutyEvent"
):
if info["sent"]:
response = await send_zenduty_alert(
identifier, identifier, resolved=True
)
Expand All @@ -212,16 +208,23 @@ async def process_zenduty_events(self, current_time):
logger.debug(f"Raising Zenduty alert {identifier}")
self.open_alerts[identifier]["sent"] = True
self.open_alerts[identifier]["last_alert"] = current_time.isoformat()
event = self.delayed_events.get(identifier)
if event:
to_alert.append(event.send())
for event_type in ["ZendutyEvent", "TelegramEvent"]:
key = f"{event_type}-{identifier}"
event = self.delayed_events.get(key)
if event:
to_alert.append(event.send())

# Send the alerts that were delayed due to thresholds
await asyncio.gather(*to_alert)

# Remove alerts that have been resolved
for identifier in to_remove:
if self.open_alerts.get(identifier):
del self.open_alerts[identifier]
if self.delayed_events.get(identifier):
del self.delayed_events[identifier]
for event_type in ["ZendutyEvent", "TelegramEvent"]:
key = f"{event_type}-{identifier}"
if self.delayed_events.get(key):
del self.delayed_events[key]

with open(self.open_alerts_file, "w") as file:
json.dump(self.open_alerts, file)
Loading