Skip to content

[bug] Prevent CancelledError from escaping #158

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

Merged
blast-hardcheese merged 2 commits into from
May 8, 2025
Merged

[bug] Prevent CancelledError from escaping #158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c6ab59
Prevent CancelledError from escaping
blast-hardcheese May 8, 2025
6ae1e09
Deduplicate
blast-hardcheese May 8, 2025
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
23 changes: 16 additions & 7 deletions src/replit_river/v2/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def unbind_connecting_task() -> None:
else:
logger.debug("unbind_connecting_task failed, id did not match")

if not self._connecting_task:
if not self._connecting_task or self._connecting_task.done():
self._connecting_task = asyncio.create_task(
_do_ensure_connected(
transport_options=self._transport_options,
Expand All @@ -308,9 +308,16 @@ def unbind_connecting_task() -> None:
)
)

await self._connecting_task
try:
await self._connecting_task
except asyncio.CancelledError:
pass

if self._terminating_task:
await self._terminating_task
try:
await self._terminating_task
except asyncio.CancelledError:
pass

def is_terminal(self) -> bool:
"""
Expand Down Expand Up @@ -403,7 +410,10 @@ async def close(
"seconds to close, leaking",
)
return
await self._close_internal(reason)
try:
await self._close_internal(reason)
except asyncio.CancelledError:
pass

def _close_internal_nowait(self, reason: Exception | None = None) -> None:
"""
Expand Down Expand Up @@ -501,10 +511,9 @@ async def do_close() -> None:
# This will get us GC'd, so this should be the last thing.
self._close_session_callback(self)

if self._terminating_task:
return self._terminating_task
if not self._terminating_task:
self._terminating_task = asyncio.create_task(do_close())

self._terminating_task = asyncio.create_task(do_close())
return self._terminating_task

def _start_buffered_message_sender(
Expand Down
Loading