mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-21 00:07:51 +00:00
Code Issues Projects Releases Wiki Activity

Suppress ConnectionClosed on sending in the main websocket.

Browse Source
This commit is contained in:
Rapptz 2016-05-06 13:19:41 -04:00
parent 2fc496304c
commit 570ccbf753
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
discord/gateway.py
View File

@ -330,6 +330,9 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
for index in reversed(removed):
del self._dispatch_listeners[index]
def _can_handle_close(self, code):
return code in (4006, 4008, 4009) or code in range(1001, 1015)
@asyncio.coroutine
def poll_event(self):
"""Polls for a DISPATCH event and handles the general gateway loop.
@ -343,7 +346,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
msg = yield from self.recv()
yield from self.received_message(msg)
except websockets.exceptions.ConnectionClosed as e:
if e.code in (4006, 4008, 4009) or e.code in range(1001, 1015):
if self._can_handle_close(e.code):
log.info('Websocket closed with {0.code}, attempting a reconnect.'.format(e))
raise ReconnectWebSocket() from e
else:
@ -356,7 +359,11 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
@asyncio.coroutine
def send_as_json(self, data):
yield from super().send(utils.to_json(data))
try:
yield from super().send(utils.to_json(data))
except websockets.exceptions.ConnectionClosed as e:
if not self._can_handle_close(e.code):
raise ConnectionClosed(e) from e
@asyncio.coroutine
def change_presence(self, *, game=None, idle=None):