LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-04 01:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle (re)connection errors more gracefully

Browse Source
This commit is contained in:
Lonami Exo 2018-06-17 11:41:35 +02:00
parent 9c63def14c
commit d18ee9ecc5
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
telethon/network/mtprotosender.py
View File

@ -132,6 +132,9 @@ class MTProtoSender:
__log__.info('User is already disconnected!') __log__.info('User is already disconnected!')
return return
await self._disconnect()
async def _disconnect(self, error=None):
__log__.info('Disconnecting from {}...'.format(self._ip)) __log__.info('Disconnecting from {}...'.format(self._ip))
self._user_connected = False self._user_connected = False
try: try:
@ -141,6 +144,9 @@ class MTProtoSender:
__log__.debug('Cancelling {} pending message(s)...' __log__.debug('Cancelling {} pending message(s)...'
.format(len(self._pending_messages))) .format(len(self._pending_messages)))
for message in self._pending_messages.values(): for message in self._pending_messages.values():
if error and not message.future.done():
message.future.set_exception(error)
else:
message.future.cancel() message.future.cancel()
self._pending_messages.clear() self._pending_messages.clear()
@ -204,24 +210,22 @@ class MTProtoSender:
receive loops. receive loops.
""" """
__log__.info('Connecting to {}:{}...'.format(self._ip, self._port)) __log__.info('Connecting to {}:{}...'.format(self._ip, self._port))
_last_error = ConnectionError()
for retry in range(1, self._retries + 1): for retry in range(1, self._retries + 1):
try: try:
__log__.debug('Connection attempt {}...'.format(retry)) __log__.debug('Connection attempt {}...'.format(retry))
await self._connection.connect(self._ip, self._port) await self._connection.connect(self._ip, self._port)
except (asyncio.TimeoutError, OSError) as e: except (asyncio.TimeoutError, OSError) as e:
_last_error = e
__log__.warning('Attempt {} at connecting failed: {}: {}' __log__.warning('Attempt {} at connecting failed: {}: {}'
.format(retry, type(e).__name__, e)) .format(retry, type(e).__name__, e))
else: else:
break break
else: else:
raise _last_error raise ConnectionError('Connection to Telegram failed {} times'
.format(self._retries))
__log__.debug('Connection success!') __log__.debug('Connection success!')
if self.state.auth_key is None: if self.state.auth_key is None:
self._is_first_query = bool(self._first_query) self._is_first_query = bool(self._first_query)
_last_error = SecurityError()
plain = MTProtoPlainSender(self._connection) plain = MTProtoPlainSender(self._connection)
for retry in range(1, self._retries + 1): for retry in range(1, self._retries + 1):
try: try:
@ -229,13 +233,14 @@ class MTProtoSender:
self.state.auth_key, self.state.time_offset =\ self.state.auth_key, self.state.time_offset =\
await authenticator.do_authentication(plain) await authenticator.do_authentication(plain)
except (SecurityError, AssertionError) as e: except (SecurityError, AssertionError) as e:
_last_error = e
__log__.warning('Attempt {} at new auth_key failed: {}' __log__.warning('Attempt {} at new auth_key failed: {}'
.format(retry, e)) .format(retry, e))
else: else:
break break
else: else:
raise _last_error await self._disconnect()
raise ConnectionError('auth_key generation failed {} times'
.format(self._retries))
__log__.debug('Starting send loop') __log__.debug('Starting send loop')
self._send_loop_handle = self._loop.create_task(self._send_loop()) self._send_loop_handle = self._loop.create_task(self._send_loop())
@ -267,7 +272,12 @@ class MTProtoSender:
await self._connection.close() await self._connection.close()
self._reconnecting = False self._reconnecting = False
try:
await self._connect() await self._connect()
except ConnectionError as e:
__log__.error('Failed to reconnect automatically, '
'disconnecting with error {}'.format(e))
await self._disconnect(error=e)
def _clean_containers(self, msg_ids): def _clean_containers(self, msg_ids):
""" """