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

Fix disconnect and reconnect for exported senders (#53)

Browse Source
This commit is contained in:
Lonami Exo 2017-05-30 13:27:23 +02:00
parent 097d1669b2
commit 6b4f2abb96
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/interactive_telegram_client.py
View File

@ -51,7 +51,11 @@ class InteractiveTelegramClient(TelegramClient):
self.found_media = set() self.found_media = set()
print('Connecting to Telegram servers...') print('Connecting to Telegram servers...')
self.connect() if not self.connect():
print('Initial connection failed. Retrying...')
if not self.connect():
print('Could not connect to Telegram servers.')
return
# Then, ensure we're authorized and have access # Then, ensure we're authorized and have access
if not self.is_user_authorized(): if not self.is_user_authorized():

11
telethon/telegram_client.py
View File

@ -147,7 +147,8 @@ class TelegramClient:
self._setup_ping_thread() self._setup_ping_thread()
return True return True
except RPCError as error: except (RPCError, ConnectionError) as error:
# Probably errors from the previous session, ignore them
self._logger.warning('Could not stabilise initial connection: {}' self._logger.warning('Could not stabilise initial connection: {}'
.format(error)) .format(error))
return False return False
@ -163,7 +164,7 @@ class TelegramClient:
self.transport = None self.transport = None
# Also disconnect all the cached senders # Also disconnect all the cached senders
for sender in self._cached_senders: for sender in self._cached_senders.values():
sender.disconnect() sender.disconnect()
self._cached_senders.clear() self._cached_senders.clear()
@ -196,7 +197,7 @@ class TelegramClient:
if not self.dc_options: if not self.dc_options:
raise ConnectionError( raise ConnectionError(
'Cannot determine the required data center IP address. ' 'Cannot determine the required data center IP address. '
'Stabilise an initial connection first.') 'Stabilise a successful initial connection first.')
return next(dc for dc in self.dc_options if dc.id == dc_id) return next(dc for dc in self.dc_options if dc.id == dc_id)
@ -218,8 +219,8 @@ class TelegramClient:
if sender and session: if sender and session:
if init_connection: if init_connection:
# TODO reconnect sender.disconnect()
pass sender.connect()
return sender return sender
else: else: