Garmelon/yaboli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add timeout to Controller's connect()

Browse source
This commit is contained in:
Joscha 2017-09-08 08:00:50 +00:00
parent ccaaf6be3f
commit 5b0f078f7a
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
yaboli/connection.py
View file

@ -77,6 +77,7 @@ class Connection:
except: except:
pass # errors are not useful here pass # errors are not useful here
self._pingtask.cancel()
await self._pingtask # should stop now that the ws is closed await self._pingtask # should stop now that the ws is closed
self._ws = None self._ws = None
@ -91,14 +92,13 @@ class Connection:
wait_for_reply = await self._ws.ping() wait_for_reply = await self._ws.ping()
await asyncio.wait_for(wait_for_reply, self.ping_timeout) await asyncio.wait_for(wait_for_reply, self.ping_timeout)
logger.debug("Pinged!") logger.debug("Pinged!")
await asyncio.sleep(self.ping_delay)
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning("Ping timed out.") logger.warning("Ping timed out.")
await self._ws.close() await self._ws.close()
break break
except (websockets.ConnectionClosed, ConnectionResetError): except (websockets.ConnectionClosed, ConnectionResetError, asyncio.CancelledError):
break return
else:
await asyncio.sleep(self.ping_delay)
async def stop(self): async def stop(self):
""" """

21
yaboli/controller.py
View file

@ -27,11 +27,12 @@ class Controller:
""" """
def __init__(self, nick, human=False, cookie=None): def __init__(self, nick, human=False, cookie=None, connect_timeout=10):
""" """
roomname - name of room to connect to roomname - name of room to connect to
human - whether the human flag should be set on connections human - whether the human flag should be set on connections
cookie - cookie to use in HTTP request, if any cookie - cookie to use in HTTP request, if any
connect_timeout - time for authentication to complete
""" """
self.nick = nick self.nick = nick
self.human = human self.human = human
@ -41,6 +42,7 @@ class Controller:
self.password = None self.password = None
self.room = None self.room = None
self.connect_timeout = connect_timeout # in seconds
self._connect_result = None self._connect_result = None
def _create_room(self, roomname): def _create_room(self, roomname):
@ -70,6 +72,7 @@ class Controller:
"no password" = password needed to connect to room "no password" = password needed to connect to room
"wrong password" = password given does not work "wrong password" = password given does not work
"disconnected" = connection closed before client could access the room "disconnected" = connection closed before client could access the room
"timeout" = timed out while waiting for server
"success" = no failure "success" = no failure
""" """
@ -97,9 +100,13 @@ class Controller:
# connection succeeded, now we need to know whether we can log in # connection succeeded, now we need to know whether we can log in
# wait for success/authentication/disconnect # wait for success/authentication/disconnect
# TODO: add a timeout try:
await self._connect_result await asyncio.wait_for(self._connect_result, self.connect_timeout)
result = self._connect_result.result() except asyncio.TimeoutError:
result = "timeout"
else:
result = self._connect_result.result()
logger.debug(f"&{roomname}._connect_result: {result!r}") logger.debug(f"&{roomname}._connect_result: {result!r}")
# deal with result # deal with result