From ae4d4ba3effd42006698b774327477077098fc70 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sat, 12 Jan 2019 12:15:29 +0100 Subject: [PATCH] Fix-up missing loggers from f271316 --- telethon/client/telegrambaseclient.py | 7 ++++--- telethon/network/connection/connection.py | 4 ++-- telethon/network/mtprotoplainsender.py | 4 ++-- telethon/network/mtprotosender.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/telethon/client/telegrambaseclient.py b/telethon/client/telegrambaseclient.py index 7ab08c82..a43309d3 100644 --- a/telethon/client/telegrambaseclient.py +++ b/telethon/client/telegrambaseclient.py @@ -189,7 +189,8 @@ class TelegramBaseClient(abc.ABC): class _Loggers(dict): def __missing__(self, key): if key.startswith("telethon."): - key = key[len("telethon."):] + key = key.split('.', maxsplit=1)[1] + return base_logger.getChild(key) self._log = _Loggers() @@ -466,7 +467,7 @@ class TelegramBaseClient(abc.ABC): # # If one were to do that, Telegram would reset the connection # with no further clues. - sender = MTProtoSender(None, self._loop) + sender = MTProtoSender(None, self._loop, loggers=self._log) await sender.connect(self._connection( dc.ip_address, dc.port, loop=self._loop, proxy=self._proxy)) self._log[__name__].info('Exporting authorization for data center %s', @@ -528,7 +529,7 @@ class TelegramBaseClient(abc.ABC): await session.set_dc(dc.id, dc.ip_address, dc.port) self._exported_sessions[cdn_redirect.dc_id] = session - __log__.info('Creating new CDN client') + self._log[__name__].info('Creating new CDN client') client = TelegramBareClient( session, self.api_id, self.api_hash, proxy=self._sender.connection.conn.proxy, diff --git a/telethon/network/connection/connection.py b/telethon/network/connection/connection.py index 5d9f9c3a..b354d3d8 100644 --- a/telethon/network/connection/connection.py +++ b/telethon/network/connection/connection.py @@ -136,9 +136,9 @@ class Connection(abc.ABC): pass except Exception as e: if isinstance(e, ConnectionError): - __log__.info('The server closed the connection while sending') + self._log.info('The server closed the connection while sending') else: - __log__.exception('Unexpected exception in the send loop') + self._log.exception('Unexpected exception in the send loop') self.disconnect() diff --git a/telethon/network/mtprotoplainsender.py b/telethon/network/mtprotoplainsender.py index f476dda5..563affd7 100644 --- a/telethon/network/mtprotoplainsender.py +++ b/telethon/network/mtprotoplainsender.py @@ -14,13 +14,13 @@ class MTProtoPlainSender: MTProto Mobile Protocol plain sender (https://core.telegram.org/mtproto/description#unencrypted-messages) """ - def __init__(self, connection): + def __init__(self, connection, *, loggers): """ Initializes the MTProto plain sender. :param connection: the Connection to be used. """ - self._state = MTProtoState(auth_key=None) + self._state = MTProtoState(auth_key=None, loggers=loggers) self._connection = connection async def send(self, request): diff --git a/telethon/network/mtprotosender.py b/telethon/network/mtprotosender.py index 513e6ba6..a756e274 100644 --- a/telethon/network/mtprotosender.py +++ b/telethon/network/mtprotosender.py @@ -227,7 +227,7 @@ class MTProtoSender: self._log.debug('Connection success!') if not self.auth_key: - plain = MTProtoPlainSender(self._connection) + plain = MTProtoPlainSender(self._connection, loggers=self._loggers) for retry in range(1, self._retries + 1): try: self._log.debug('New auth_key attempt {}...'.format(retry))