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

Socket OSError logging

Browse Source
This commit is contained in:
Andrey Egorov 2017-11-16 17:31:39 +03:00
parent 2efcfbd416
commit 653dd21259
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/extensions/tcp_client.py
View File

@ -2,6 +2,7 @@
import asyncio import asyncio
import errno import errno
import socket import socket
import logging
from datetime import timedelta from datetime import timedelta
from io import BytesIO, BufferedWriter from io import BytesIO, BufferedWriter
@ -22,6 +23,7 @@ class TcpClient:
self.proxy = proxy self.proxy = proxy
self._socket = None self._socket = None
self._loop = loop if loop else asyncio.get_event_loop() self._loop = loop if loop else asyncio.get_event_loop()
self._logger = logging.getLogger(__name__)
if isinstance(timeout, timedelta): if isinstance(timeout, timedelta):
self.timeout = timeout.seconds self.timeout = timeout.seconds
@ -58,9 +60,16 @@ class TcpClient:
if not self._socket: if not self._socket:
self._recreate_socket(mode) self._recreate_socket(mode)
await self._loop.sock_connect(self._socket, address) await asyncio.wait_for(
self._loop.sock_connect(self._socket, address),
timeout=self.timeout,
loop=self._loop
)
break # Successful connection, stop retrying to connect break # Successful connection, stop retrying to connect
except asyncio.TimeoutError as e:
raise TimeoutError() from e
except OSError as e: except OSError as e:
self._logger.debug('Connect exception: %r' % e)
# ConnectionError + (errno.EBADF, errno.ENOTSOCK, errno.EINVAL) # ConnectionError + (errno.EBADF, errno.ENOTSOCK, errno.EINVAL)
if e.errno in CONN_RESET_ERRNOS: if e.errno in CONN_RESET_ERRNOS:
self._socket = None self._socket = None
@ -99,6 +108,7 @@ class TcpClient:
except asyncio.TimeoutError as e: except asyncio.TimeoutError as e:
raise TimeoutError() from e raise TimeoutError() from e
except OSError as e: except OSError as e:
self._logger.debug('Write exception: %r' % e)
if e.errno in CONN_RESET_ERRNOS: if e.errno in CONN_RESET_ERRNOS:
self._raise_connection_reset() self._raise_connection_reset()
else: else:
@ -123,6 +133,7 @@ class TcpClient:
except asyncio.TimeoutError as e: except asyncio.TimeoutError as e:
raise TimeoutError() from e raise TimeoutError() from e
except OSError as e: except OSError as e:
self._logger.debug('Read exception: %r' % e)
if e.errno in CONN_RESET_ERRNOS: if e.errno in CONN_RESET_ERRNOS:
self._raise_connection_reset() self._raise_connection_reset()
else: else: