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

Don't raise an exception during the signal handlers.

Browse Source
This commit is contained in:
Rapptz 2019-04-07 16:10:44 -04:00
parent 7b95611e62
commit 84c1eac62a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
discord/client.py
View File

@ -55,12 +55,6 @@ from .appinfo import AppInfo
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class _ProperCleanup(Exception):
pass
def _raise_proper_cleanup():
raise _ProperCleanup
def _cancel_tasks(loop, tasks): def _cancel_tasks(loop, tasks):
if not tasks: if not tasks:
return return
@ -503,6 +497,8 @@ class Client:
def _do_cleanup(self): def _do_cleanup(self):
log.info('Cleaning up event loop.') log.info('Cleaning up event loop.')
loop = self.loop loop = self.loop
if loop.is_closed():
return # we're already cleaning up
task = asyncio.ensure_future(self.close(), loop=loop) task = asyncio.ensure_future(self.close(), loop=loop)
@ -553,15 +549,16 @@ class Client:
is_windows = sys.platform == 'win32' is_windows = sys.platform == 'win32'
loop = self.loop loop = self.loop
if not is_windows: if not is_windows:
loop.add_signal_handler(signal.SIGINT, _raise_proper_cleanup) loop.add_signal_handler(signal.SIGINT, self._do_cleanup)
loop.add_signal_handler(signal.SIGTERM, _raise_proper_cleanup) loop.add_signal_handler(signal.SIGTERM, self._do_cleanup)
try: try:
loop.run_until_complete(self.start(*args, **kwargs)) loop.run_until_complete(self.start(*args, **kwargs))
except (_ProperCleanup, 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:
self._do_cleanup() if is_windows:
self._do_cleanup()
# properties # properties