LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-12 05:29:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

follow-up prev

Browse source
This commit is contained in:
SomberNight 2019-05-21 18:43:16 +02:00
parent fecef91ee0
commit 6ec1578a90
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
electrum/interface.py
View file

@ -167,6 +167,15 @@ class RequestTimedOut(GracefulDisconnect):
class ErrorParsingSSLCert(Exception): pass class ErrorParsingSSLCert(Exception): pass
class ErrorGettingSSLCertFromServer(Exception): pass class ErrorGettingSSLCertFromServer(Exception): pass
class ConnectError(Exception): pass
class _Connector(aiorpcx.Connector):
async def create_connection(self):
try:
return await super().create_connection()
except OSError as e:
raise ConnectError(e)
def deserialize_server(server_str: str) -> Tuple[str, str, str]: def deserialize_server(server_str: str) -> Tuple[str, str, str]:
@ -333,8 +342,7 @@ class Interface(Logger):
return return
try: try:
await self.open_session(ssl_context) await self.open_session(ssl_context)
except (asyncio.CancelledError, ConnectionError, socket.gaierror, aiorpcx.socks.SOCKSError) as e: except (asyncio.CancelledError, ConnectError, aiorpcx.socks.SOCKSError) as e:
# note: catching OSError would be too broad here... don't want to catch file system exceptions
self.logger.info(f'disconnecting due to: {repr(e)}') self.logger.info(f'disconnecting due to: {repr(e)}')
return return
@ -419,9 +427,9 @@ class Interface(Logger):
return self.network.default_server == self.server return self.network.default_server == self.server
async def open_session(self, sslc, exit_early=False): async def open_session(self, sslc, exit_early=False):
async with aiorpcx.Connector(NotificationSession, async with _Connector(NotificationSession,
host=self.host, port=self.port, host=self.host, port=self.port,
ssl=sslc, proxy=self.proxy) as session: ssl=sslc, proxy=self.proxy) as session:
self.session = session # type: NotificationSession self.session = session # type: NotificationSession
self.session.interface = self self.session.interface = self
self.session.set_default_timeout(self.network.get_network_timeout_seconds(NetworkTimeout.Generic)) self.session.set_default_timeout(self.network.get_network_timeout_seconds(NetworkTimeout.Generic))