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

Re-implement how Client.run is done by using run_forever instead.

Browse Source
This commit is contained in:
Rapptz 2017-05-20 12:46:26 -04:00
parent 4dfaffd5f2
commit f3eb039c4b
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
discord/client.py
View File

@ -454,7 +454,7 @@ class Client:
def _do_cleanup(self): def _do_cleanup(self):
if self.loop.is_closed() or not self.loop.is_running(): if self.loop.is_closed():
return # we're already cleaning up return # we're already cleaning up
self.loop.run_until_complete(self.close()) self.loop.run_until_complete(self.close())
@ -499,15 +499,29 @@ class Client:
called after this function call will not execute until it returns. called after this function call will not execute until it returns.
""" """
is_windows = sys.platform == 'win32' is_windows = sys.platform == 'win32'
loop = self.loop
if not is_windows: if not is_windows:
self.loop.add_signal_handler(signal.SIGINT, self._do_cleanup) loop.add_signal_handler(signal.SIGINT, self._do_cleanup)
self.loop.add_signal_handler(signal.SIGTERM, self._do_cleanup) loop.add_signal_handler(signal.SIGTERM, self._do_cleanup)
task = compat.create_task(self.start(*args, **kwargs), loop=loop)
def kill_loop_on_finish(fut):
try:
fut.result()
except:
pass # don't care
finally:
loop.stop()
task.add_done_callback(kill_loop_on_finish)
try: try:
self.loop.run_until_complete(self.start(*args, **kwargs)) loop.run_forever()
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
finally: finally:
task.remove_done_callback(kill_loop_on_finish)
if is_windows: if is_windows:
self._do_cleanup() self._do_cleanup()