LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

timeout earlier on connect

Browse source
This commit is contained in:
Victor Shyba 2019-02-12 18:51:12 -03:00 • committed by Lex Berezhny
parent 6c68ba1d22
commit 57eb56b92d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
torba/client/basenetwork.py
View file

@ -38,9 +38,9 @@ class ClientSession(BaseClientSession):
await self.send_request('server.banner') await self.send_request('server.banner')
await asyncio.sleep(self.max_seconds_idle//3) await asyncio.sleep(self.max_seconds_idle//3)
async def create_connection(self): async def create_connection(self, timeout=6):
connector = Connector(lambda: self, *self.server) connector = Connector(lambda: self, *self.server)
await connector.create_connection() await asyncio.wait_for(connector.create_connection(), timeout=timeout)
self.ping_task = asyncio.create_task(self.ping_forever()) self.ping_task = asyncio.create_task(self.ping_forever())
async def handle_request(self, request): async def handle_request(self, request):
@ -78,11 +78,12 @@ class BaseNetwork:
async def start(self): async def start(self):
self.running = True self.running = True
delay = 0.0 delay = 0.0
connect_timeout = self.config.get('connect_timeout', 6)
for server in cycle(self.config['default_servers']): for server in cycle(self.config['default_servers']):
self.client = ClientSession(network=self, server=server) self.client = ClientSession(network=self, server=server)
connection_string = '{}:{}'.format(*server) connection_string = '{}:{}'.format(*server)
try: try:
await self.client.create_connection() await self.client.create_connection(connect_timeout)
await self.ensure_server_version() await self.ensure_server_version()
log.info("Successfully connected to SPV wallet server: %s", connection_string) log.info("Successfully connected to SPV wallet server: %s", connection_string)
self._on_connected_controller.add(True) self._on_connected_controller.add(True)
@ -90,6 +91,8 @@ class BaseNetwork:
await self.client.on_disconnected.first await self.client.on_disconnected.first
except CancelledError: except CancelledError:
self.running = False self.running = False
except asyncio.TimeoutError:
log.warning("Timed out connecting to: %s", connection_string)
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
log.exception("Connecting to %s raised an exception:", connection_string) log.exception("Connecting to %s raised an exception:", connection_string)
if not self.running: if not self.running: