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

Stop the event loop if it's running during cleanup.

Browse Source 
Also handle the coroutine directly instead of using run_until_complete
This commit is contained in:
Rapptz 2019-04-08 23:36:31 -04:00
parent 3a36f78e08
commit dcdcf1adac
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
discord/client.py
View File

@ -501,6 +501,10 @@ class Client:
if loop.is_closed(): if loop.is_closed():
return # we're already cleaning up return # we're already cleaning up
# Stop the event loop if it's running
if loop.is_running():
loop.stop()
task = asyncio.ensure_future(self.close(), loop=loop) task = asyncio.ensure_future(self.close(), loop=loop)
def stop_loop(fut): def stop_loop(fut):
@ -553,8 +557,11 @@ class Client:
loop.add_signal_handler(signal.SIGINT, self._do_cleanup) loop.add_signal_handler(signal.SIGINT, self._do_cleanup)
loop.add_signal_handler(signal.SIGTERM, self._do_cleanup) loop.add_signal_handler(signal.SIGTERM, self._do_cleanup)
future = asyncio.ensure_future(self.start(*args, **kwargs), loop=loop)
future.add_done_callback(lambda f: loop.stop())
try: try:
loop.run_until_complete(self.start(*args, **kwargs)) loop.run_forever()
except KeyboardInterrupt: except KeyboardInterrupt:
log.info('Received signal to terminate bot and event loop.') log.info('Received signal to terminate bot and event loop.')
finally: finally: