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

Added retry_delay parameter for auto-reconnection (#1031)

Browse Source
This commit is contained in:
painor 2018-10-28 10:55:58 +01:00 committed by Lonami
parent 15546fd957
commit 45999001be
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/client/telegrambaseclient.py
View File

@ -89,6 +89,9 @@ class TelegramBaseClient(abc.ABC):
retries, but this is not recommended, since the program can retries, but this is not recommended, since the program can
get stuck in an infinite loop. get stuck in an infinite loop.
retry_delay (`int` | `float`, optional):
The delay in seconds to sleep between automatic reconnections.
auto_reconnect (`bool`, optional): auto_reconnect (`bool`, optional):
Whether reconnection should be retried `connection_retries` Whether reconnection should be retried `connection_retries`
times automatically if Telegram disconnects us or not. times automatically if Telegram disconnects us or not.
@ -150,6 +153,7 @@ class TelegramBaseClient(abc.ABC):
timeout=10, timeout=10,
request_retries=5, request_retries=5,
connection_retries=5, connection_retries=5,
retry_delay=1,
auto_reconnect=True, auto_reconnect=True,
sequential_updates=False, sequential_updates=False,
flood_sleep_threshold=60, flood_sleep_threshold=60,
@ -210,6 +214,7 @@ class TelegramBaseClient(abc.ABC):
self._request_retries = request_retries or sys.maxsize self._request_retries = request_retries or sys.maxsize
self._connection_retries = connection_retries or sys.maxsize self._connection_retries = connection_retries or sys.maxsize
self._retry_delay = retry_delay or 0
self._proxy = proxy self._proxy = proxy
self._timeout = timeout self._timeout = timeout
self._auto_reconnect = auto_reconnect self._auto_reconnect = auto_reconnect
@ -237,6 +242,7 @@ class TelegramBaseClient(abc.ABC):
self._sender = MTProtoSender( self._sender = MTProtoSender(
self.session.auth_key, self._loop, self.session.auth_key, self._loop,
retries=self._connection_retries, retries=self._connection_retries,
delay=self._retry_delay,
auto_reconnect=self._auto_reconnect, auto_reconnect=self._auto_reconnect,
connect_timeout=self._timeout, connect_timeout=self._timeout,
update_callback=self._handle_update, update_callback=self._handle_update,

6
telethon/network/mtprotosender.py
View File

@ -60,11 +60,12 @@ class MTProtoSender:
key exists yet. key exists yet.
""" """
def __init__(self, auth_key, loop, *, def __init__(self, auth_key, loop, *,
retries=5, auto_reconnect=True, connect_timeout=None, retries=5, delay=1, auto_reconnect=True, connect_timeout=None,
update_callback=None, auto_reconnect_callback=None): update_callback=None, auto_reconnect_callback=None):
self._connection = None self._connection = None
self._loop = loop self._loop = loop
self._retries = retries self._retries = retries
self._delay = delay
self._auto_reconnect = auto_reconnect self._auto_reconnect = auto_reconnect
self._connect_timeout = connect_timeout self._connect_timeout = connect_timeout
self._update_callback = update_callback self._update_callback = update_callback
@ -215,6 +216,7 @@ class MTProtoSender:
except (ConnectionError, asyncio.TimeoutError) as e: except (ConnectionError, asyncio.TimeoutError) as 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))
await asyncio.sleep(self._delay)
else: else:
break break
else: else:
@ -234,6 +236,7 @@ class MTProtoSender:
except (SecurityError, AssertionError) as e: except (SecurityError, AssertionError) as e:
__log__.warning('Attempt {} at new auth_key failed: {}' __log__.warning('Attempt {} at new auth_key failed: {}'
.format(retry, e)) .format(retry, e))
await asyncio.sleep(self._delay)
else: else:
e = ConnectionError('auth_key generation failed {} times' e = ConnectionError('auth_key generation failed {} times'
.format(self._retries)) .format(self._retries))
@ -314,6 +317,7 @@ class MTProtoSender:
await self._connect() await self._connect()
except ConnectionError: except ConnectionError:
__log__.info('Failed reconnection retry %d/%d', retry, retries) __log__.info('Failed reconnection retry %d/%d', retry, retries)
await asyncio.sleep(self._delay)
else: else:
self._send_queue.extend(self._pending_state.values()) self._send_queue.extend(self._pending_state.values())
self._pending_state.clear() self._pending_state.clear()