LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-24 07:20:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully handle user-invoked disconnects

Browse Source
This commit is contained in:
Lonami Exo 2023-10-19 19:28:00 +02:00
parent 854d3745b3
commit 864d5cd444
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/telethon/_impl/client/client/net.py
View File

@ -207,6 +207,9 @@ async def disconnect(self: Client) -> None:
return return
assert self._dispatcher assert self._dispatcher
sender = self._sender
self._sender = None # treated as disconnected
self._dispatcher.cancel() self._dispatcher.cancel()
try: try:
await self._dispatcher await self._dispatcher
@ -220,11 +223,9 @@ async def disconnect(self: Client) -> None:
self._dispatcher = None self._dispatcher = None
try: try:
await self._sender.disconnect() await sender.disconnect()
except Exception: except Exception:
self._logger.exception("unhandled exception during disconnect; this is a bug") self._logger.exception("unhandled exception during disconnect; this is a bug")
finally:
self._sender = None
self._session.state = self._message_box.session_state() self._session.state = self._message_box.session_state()
await self._storage.save(self._session) await self._storage.save(self._session)
@ -272,7 +273,15 @@ async def step_sender(client: Client, sender: Sender, lock: asyncio.Lock) -> Non
pass pass
else: else:
async with lock: async with lock:
updates = await sender.step() try:
updates = await sender.step()
except ConnectionError:
if client.connected:
raise
else:
# disconnect was called, so the socket returning 0 bytes is expected
return
process_socket_updates(client, updates) process_socket_updates(client, updates)