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

Time out when creating the ws connections

Browse source
This commit is contained in:
Joscha 2019-04-14 22:25:42 +00:00
parent e53ce42e99
commit d9f25a04fb
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## Next version ## Next version
- add timeout for creating ws connections
## 1.1.2 (2019-04-14) ## 1.1.2 (2019-04-14)
- fix room authentication - fix room authentication

13
yaboli/connection.py
View file

@ -82,6 +82,9 @@ class Connection:
"part-event" and "ping". "part-event" and "ping".
""" """
# Timeout for waiting for the ws connection to be established
CONNECT_TIMEOUT = 10 # seconds
# Maximum duration between euphoria's ping messages. Euphoria usually sends # Maximum duration between euphoria's ping messages. Euphoria usually sends
# ping messages every 20 to 30 seconds. # ping messages every 20 to 30 seconds.
PING_TIMEOUT = 40 # seconds PING_TIMEOUT = 40 # seconds
@ -183,8 +186,12 @@ class Connection:
try: try:
logger.debug(f"Creating ws connection to {self._url!r}") logger.debug(f"Creating ws connection to {self._url!r}")
ws = await websockets.connect(self._url, ws = await asyncio.wait_for(
extra_headers=self._cookie_jar.get_cookies_as_headers()) websockets.connect(self._url,
extra_headers=self._cookie_jar.get_cookies_as_headers()),
self.CONNECT_TIMEOUT
)
logger.debug(f"Established ws connection to {self._url!r}")
self._ws = ws self._ws = ws
self._awaiting_replies = {} self._awaiting_replies = {}
@ -200,7 +207,7 @@ class Connection:
return True return True
except (websockets.InvalidHandshake, websockets.InvalidStatusCode, except (websockets.InvalidHandshake, websockets.InvalidStatusCode,
socket.gaierror): socket.gaierror, asyncio.TimeoutError):
logger.debug("Connection failed") logger.debug("Connection failed")
return False return False