Skip to content

fix(gateway): wait for Telegram polling readiness before restart notification #69530

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

Closed
webtecnica wants to merge 1 commit into from
Closed

fix(gateway): wait for Telegram polling readiness before restart notification #69530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 31 additions & 0 deletions gateway/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16509,6 +16509,27 @@ async def _send_update_notification(self) -> bool:

return True

async def _wait_adapter_send_ready(self, adapter: Any) -> None:
"""Wait for platform-specific send readiness (e.g. Telegram polling).

On v0.19.0+ the faster cold-start path reaches restart-notification send
before Telegram's polling has made its first successful getUpdates
request, causing send_path_degraded failures (#69370).

Uses duck-typing: if the adapter exposes a ``_polling_progress_event``
(as the Telegram adapter does), we wait on it with a bounded timeout.
Other adapters have no-op.
"""
progress_event = getattr(adapter, "_polling_progress_event", None)
if progress_event is not None and not progress_event.is_set():
try:
await asyncio.wait_for(progress_event.wait(), timeout=15.0)
except asyncio.TimeoutError:
logger.debug(
"Timeout waiting for adapter send readiness "
"(polling progress) — proceeding anyway"
)

async def _send_restart_notification(self) -> Optional[tuple[str, str, Optional[str]]]:
"""Notify the chat that initiated /restart that the gateway is back."""
notify_path = _hermes_home / ".restart_notify.json"
Expand Down Expand Up @@ -16543,6 +16564,12 @@ async def _send_restart_notification(self) -> Optional[tuple[str, str, Optional[
)
return None

# Wait for the platform adapter's send path to be healthy before
# attempting delivery. The generic 1 s settle in start() helps,
# but Telegram's polling-based adapters need their first successful
# getUpdates round to clear _send_path_degraded.
await self._wait_adapter_send_ready(adapter)

metadata = self._thread_metadata_for_target(
platform,
chat_id,
Expand Down Expand Up @@ -16620,6 +16647,10 @@ async def _send_home_channel_startup_notifications(
home.thread_id,
adapter=adapter,
)
# Wait for the platform adapter's send path to be healthy
# before attempting the startup notification broadcast.
# See _wait_adapter_send_ready docstring (#69370).
await self._wait_adapter_send_ready(adapter)
if metadata:
result = await adapter.send(
str(home.chat_id),
Expand Down
Loading