jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'end-filter-run' into 'master'

Browse Source 
fix: allow cancelling the run_filters coroutine

See merge request poezio/slixmpp!184
This commit is contained in:
mathieui 2022-02-18 22:29:02 +01:00
commit 28fe68c7d3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slixmpp/xmlstream/xmlstream.py
View File

@ -1239,7 +1239,7 @@ class XMLStream(asyncio.BaseProtocol):
else: else:
self.send_raw(data) self.send_raw(data)
async def run_filters(self) -> NoReturn: async def run_filters(self) -> None:
""" """
Background loop that processes stanzas to send. Background loop that processes stanzas to send.
""" """
@ -1295,6 +1295,9 @@ class XMLStream(asyncio.BaseProtocol):
self.send_raw(data) self.send_raw(data)
except ContinueQueue as exc: except ContinueQueue as exc:
log.debug('Stanza in send queue not sent: %s', exc) log.debug('Stanza in send queue not sent: %s', exc)
except asyncio.CancelledError:
log.debug('Send coroutine received cancel(), stopping')
return
except Exception: except Exception:
log.error('Exception raised in send queue:', exc_info=True) log.error('Exception raised in send queue:', exc_info=True)
self.waiting_queue.task_done() self.waiting_queue.task_done()