matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Reconnect when WebSocket dies

Browse Source 
Check if the WebSocket connection was supposed to terminate and
reconnect to the gateway if this is not the case.
This commit is contained in:
Hornwitser 2015-09-27 17:18:40 +02:00
parent 247d1f9ed4
commit 5e952015a6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
discord/client.py
View File

@ -352,6 +352,8 @@ class Client(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._is_logged_in = False self._is_logged_in = False
self._close = False
self.options = kwargs
self.connection = ConnectionState(self.dispatch, **kwargs) self.connection = ConnectionState(self.dispatch, **kwargs)
self.dispatch_lock = threading.RLock() self.dispatch_lock = threading.RLock()
self.token = '' self.token = ''
@ -467,6 +469,18 @@ class Client(object):
log.info('Client is being run') log.info('Client is being run')
self.ws.run() self.ws.run()
# The WebSocket is guaranteed to be terminated after ws.run().
# Check if we wanted it to close and reconnect if not.
while not self._close:
gateway = requests.get(endpoints.GATEWAY, headers=self.headers)
if gateway.status_code != 200:
raise GatewayNotFound()
self.connection = ConnectionState(self.dispatch, **self.options)
self._create_websocket(gateway.json().get('url'), reconnect=False)
self.ws.run()
log.info('Client exiting')
@property @property
def is_logged_in(self): def is_logged_in(self):
"""Returns True if the client is successfully logged in. False otherwise.""" """Returns True if the client is successfully logged in. False otherwise."""
@ -642,6 +656,7 @@ class Client(object):
def logout(self): def logout(self):
"""Logs out of Discord and closes all connections.""" """Logs out of Discord and closes all connections."""
response = requests.post(endpoints.LOGOUT) response = requests.post(endpoints.LOGOUT)
self._close = True
self.ws.close() self.ws.close()
self._is_logged_in = False self._is_logged_in = False
log.debug(request_logging_format.format(name='logout', response=response)) log.debug(request_logging_format.format(name='logout', response=response))