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

Properly close session if client failed to start

Browse Source 
`keep_alive` was not defined until it was created in `received_message`, `ws` is `None` until its actually connected, which doesn't always happen.  If an error happens before things start up properly, the client should now clean its objects up (fixes `unclosed client session` warning).
This commit is contained in:
Daniel 2016-04-22 22:40:25 -04:00
parent bd5effeb68
commit 5a2b8e2ce6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
discord/client.py
View File

@ -118,6 +118,7 @@ class Client:
self.gateway = None self.gateway = None
self.voice = None self.voice = None
self.session_id = None self.session_id = None
self.keep_alive = None
self.sequence = 0 self.sequence = 0
self.loop = asyncio.get_event_loop() if loop is None else loop self.loop = asyncio.get_event_loop() if loop is None else loop
self._listeners = [] self._listeners = []
@ -589,12 +590,13 @@ class Client:
yield from self.voice.disconnect() yield from self.voice.disconnect()
self.voice = None self.voice = None
if self.ws.open: if self.ws is not None and self.ws.open:
yield from self.ws.close() yield from self.ws.close()
if self.keep_alive is not None:
self.keep_alive.cancel()
yield from self.session.close() yield from self.session.close()
self.keep_alive.cancel()
self._closed.set() self._closed.set()
self._is_ready.clear() self._is_ready.clear()