mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2025-01-24 16:24:15 +03:00
Fix-up missing loggers from f271316
This commit is contained in:
parent
f271316d7d
commit
ae4d4ba3ef
|
@ -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,
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue
Block a user