mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-11 08:19:54 +00:00
Code Issues Projects Releases Wiki Activity

Client.run now does cleanup when KeyboardInterrupt is encountered.

Browse Source
This commit is contained in:
Rapptz 2015-12-14 16:26:15 -05:00
parent 9137d92f67
commit 6d26d73e24
2 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
discord/client.py
View File

@ -262,8 +262,13 @@ class Client:
def _run_event(self, event, *args, **kwargs): def _run_event(self, event, *args, **kwargs):
try: try:
yield from getattr(self, event)(*args, **kwargs) yield from getattr(self, event)(*args, **kwargs)
except Exception as e: except asyncio.CancelledError:
yield from self.on_error(event, *args, **kwargs) pass
except Exception:
try:
yield from self.on_error(event, *args, **kwargs)
except asyncio.CancelledError:
pass
def dispatch(self, event, *args, **kwargs): def dispatch(self, event, *args, **kwargs):
log.debug('Dispatching event {}'.format(event)) log.debug('Dispatching event {}'.format(event))
@ -278,16 +283,19 @@ class Client:
@asyncio.coroutine @asyncio.coroutine
def keep_alive_handler(self, interval): def keep_alive_handler(self, interval):
while not self._closed: try:
payload = { while not self._closed:
'op': 1, payload = {
'd': int(time.time()) 'op': 1,
} 'd': int(time.time())
}
msg = 'Keeping websocket alive with timestamp {}' msg = 'Keeping websocket alive with timestamp {}'
log.debug(msg.format(payload['d'])) log.debug(msg.format(payload['d']))
yield from self.ws.send(utils.to_json(payload)) yield from self.ws.send(utils.to_json(payload))
yield from asyncio.sleep(interval) yield from asyncio.sleep(interval)
except asyncio.CancelledError:
pass
@asyncio.coroutine @asyncio.coroutine
def on_error(self, event_method, *args, **kwargs): def on_error(self, event_method, *args, **kwargs):
@ -662,14 +670,34 @@ class Client:
"""A blocking call that abstracts away the `event loop`_ """A blocking call that abstracts away the `event loop`_
initialisation from you. initialisation from you.
Equivalent to: :: If you want more control over the event loop then this
function should not be used. Use :meth:`start` coroutine
or :meth:`connect` + :meth:`login`.
loop.run_until_complete(start(email, password)) Roughly Equivalent to: ::
loop.close()
try:
loop.run_until_complete(start(email, password))
except KeyboardInterrupt:
loop.run_until_complete(logout())
# cancel all tasks lingering
finally:
loop.close()
""" """
try:
self.loop.run_until_complete(self.start(email, password)) self.loop.run_until_complete(self.start(email, password))
self.loop.close() except KeyboardInterrupt:
self.loop.run_until_complete(self.logout())
pending = asyncio.Task.all_tasks()
gathered = asyncio.gather(*pending)
try:
gathered.cancel()
self.loop.run_forever()
gathered.exception()
except:
pass
finally:
self.loop.close()
# event registration # event registration

21
discord/voice_client.py
View File

@ -175,16 +175,19 @@ class VoiceClient:
@asyncio.coroutine @asyncio.coroutine
def keep_alive_handler(self, delay): def keep_alive_handler(self, delay):
while True: try:
payload = { while True:
'op': 3, payload = {
'd': int(time.time()) 'op': 3,
} 'd': int(time.time())
}
msg = 'Keeping voice websocket alive with timestamp {}' msg = 'Keeping voice websocket alive with timestamp {}'
log.debug(msg.format(payload['d'])) log.debug(msg.format(payload['d']))
yield from self.ws.send(utils.to_json(payload)) yield from self.ws.send(utils.to_json(payload))
yield from asyncio.sleep(delay) yield from asyncio.sleep(delay)
except asyncio.CancelledError:
pass
@asyncio.coroutine @asyncio.coroutine
def received_message(self, msg): def received_message(self, msg):