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

Fix bots vanishing after trying to reconnect

Browse source
This commit is contained in:
Joscha 2018-08-08 16:55:59 +00:00
parent fa579ec231
commit ceaf8748e9
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
yaboli/connection.py
View file

@ -79,7 +79,7 @@ class Connection:
if self._ws:
await self._ws.close()
async def _connect(self, tries):
async def _connect(self, tries, timeout=10):
"""
Attempt to connect to a room.
If the Connection is already connected, it attempts to reconnect.
@ -97,10 +97,15 @@ class Connection:
try:
if self.cookiejar:
cookies = [("Cookie", cookie) for cookie in self.cookiejar.sniff()]
self._ws = await websockets.connect(self.url, max_size=None, extra_headers=cookies)
ws = asyncio.ensure_future(
websockets.connect(self.url, max_size=None, extra_headers=cookies)
)
else:
self._ws = await websockets.connect(self.url, max_size=None)
except (websockets.InvalidHandshake, socket.gaierror): # not websockets.InvalidURI
ws = asyncio.ensure_future(
websockets.connect(self.url, max_size=None)
)
self._ws = await asyncio.wait_for(ws, timeout)
except (websockets.InvalidHandshake, socket.gaierror, asyncio.TimeoutError): # not websockets.InvalidURI
self._ws = None
if tries is not None: