LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-05 20:50:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix connect method infinite await and double reconnection

Browse Source
This commit is contained in:
arktic 2019-02-16 21:11:21 +03:00
parent f540c4e089
commit cbfa3e7f8c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
telethon/network/mtprotosender.py
View File

@ -386,20 +386,27 @@ class MTProtoSender:
data = self._state.encrypt_message_data(data) data = self._state.encrypt_message_data(data)
try: try:
await self._connection.send(data) await self._connection.send(data)
except ConnectionError: except ConnectionError as e:
self._log.info('Connection closed while sending data') __log__.error('Connection closed while sending data')
self._start_reconnect() # TODO we will reconnect in _recv loop
return # this will cause double reconnection
# self._start_reconnect()
error = e
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):
self._pending_state[state.msg_id] = state if not error:
self._pending_state[state.msg_id] = state
else:
state.future.set_exception(error)
else: else:
for s in state: for s in state:
if isinstance(s.request, TLRequest): if isinstance(s.request, TLRequest):
self._pending_state[s.msg_id] = s if not error:
self._pending_state[s.msg_id] = s
else:
s.future.set_exception(error)
self._log.debug('Encrypted messages put in a queue to be sent') self._log.debug('Encrypted messages put in a queue to be sent')
@_cancellable @_cancellable