diff options
| author | Rapptz <[email protected]> | 2017-04-22 02:14:06 -0400 |
|---|---|---|
| committer | Rapptz <[email protected]> | 2017-04-22 02:18:35 -0400 |
| commit | 3cfebc46051e9d09bea851aded8c13a68269542b (patch) | |
| tree | 5af9ab735a28d925ba89af529d431a64676a2ba7 /discord/client.py | |
| parent | [commands] Allow loading cogs from folders. (diff) | |
| download | discord.py-3cfebc46051e9d09bea851aded8c13a68269542b.tar.xz discord.py-3cfebc46051e9d09bea851aded8c13a68269542b.zip | |
Timeout when doing initial connection.
Diffstat (limited to 'discord/client.py')
| -rw-r--r-- | discord/client.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/discord/client.py b/discord/client.py index 78da75d0..95f71327 100644 --- a/discord/client.py +++ b/discord/client.py @@ -342,17 +342,18 @@ class Client: @asyncio.coroutine def _connect(self): - self.ws = yield from DiscordWebSocket.from_client(self, shard_id=self.shard_id) - + coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id) + self.ws = yield from asyncio.wait_for(coro, timeout=180.0, loop=self.loop) while True: try: yield from self.ws.poll_event() except ResumeWebSocket as e: log.info('Got a request to RESUME the websocket.') - self.ws = yield from DiscordWebSocket.from_client(self, shard_id=self.shard_id, - session=self.ws.session_id, - sequence=self.ws.sequence, - resume=True) + coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id, + session=self.ws.session_id, + sequence=self.ws.sequence, + resume=True) + self.ws = yield from asyncio.wait_for(coro, timeout=180.0, loop=self.loop) @asyncio.coroutine def connect(self, *, reconnect=True): |