LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-14 05:26:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix requests were not re-enqueued if sending failed

Browse Source
This commit is contained in:
Lonami Exo 2020-09-29 21:07:38 +02:00
parent c864ef7e16
commit 10b2b60415
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
telethon/network/mtprotosender.py
View File

@ -431,13 +431,12 @@ class MTProtoSender:
len(batch), len(data)) len(batch), len(data))
data = self._state.encrypt_message_data(data) data = self._state.encrypt_message_data(data)
try:
await self._connection.send(data)
except IOError as e:
self._log.info('Connection closed while sending data')
self._start_reconnect(e)
return
# Whether sending succeeds or not, the popped requests are now
# pending because they're removed from the queue. If a reconnect
# occurs, they will be removed from pending state and re-enqueued
# so even if the network fails they won't be lost. If they were
# never re-enqueued, the future waiting for a response "locks".
for state in batch: for state in batch:
if not isinstance(state, list): if not isinstance(state, list):
if isinstance(state.request, TLRequest): if isinstance(state.request, TLRequest):
@ -447,6 +446,13 @@ class MTProtoSender:
if isinstance(s.request, TLRequest): if isinstance(s.request, TLRequest):
self._pending_state[s.msg_id] = s self._pending_state[s.msg_id] = s
try:
await self._connection.send(data)
except IOError as e:
self._log.info('Connection closed while sending data')
self._start_reconnect(e)
return
self._log.debug('Encrypted messages put in a queue to be sent') self._log.debug('Encrypted messages put in a queue to be sent')
async def _recv_loop(self): async def _recv_loop(self):