pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cancel run_filters task upon disconnect

Browse source
This commit is contained in:
ehendrix23 2020-06-12 19:03:58 +02:00
parent bb61f0f39d
commit 145bb7a36e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
slixmpp/xmlstream/xmlstream.py
View file

@ -229,6 +229,8 @@ class XMLStream(asyncio.BaseProtocol):
self.add_event_handler('disconnected', self._remove_schedules) self.add_event_handler('disconnected', self._remove_schedules)
self.add_event_handler('session_start', self._start_keepalive) self.add_event_handler('session_start', self._start_keepalive)
self._run_filters = None
@property @property
def loop(self): def loop(self):
if self._loop is None: if self._loop is None:
@ -271,10 +273,12 @@ class XMLStream(asyncio.BaseProtocol):
localhost localhost
""" """
asyncio.ensure_future( if self._run_filters is None:
self._run_filters = asyncio.ensure_future(
self.run_filters(), self.run_filters(),
loop=self.loop, loop=self.loop,
) )
self.disconnect_reason = None self.disconnect_reason = None
self.cancel_connection_attempt() self.cancel_connection_attempt()
self.connect_loop_wait = 0 self.connect_loop_wait = 0
@ -463,6 +467,8 @@ class XMLStream(asyncio.BaseProtocol):
self.parser = None self.parser = None
self.transport = None self.transport = None
self.socket = None self.socket = None
if self._run_filters:
self._run_filters.cancel()
def cancel_connection_attempt(self): def cancel_connection_attempt(self):
""" """
@ -474,6 +480,9 @@ class XMLStream(asyncio.BaseProtocol):
if self._current_connection_attempt: if self._current_connection_attempt:
self._current_connection_attempt.cancel() self._current_connection_attempt.cancel()
self._current_connection_attempt = None self._current_connection_attempt = None
if self._run_filters:
self._run_filters.cancel()
def disconnect(self, wait: float = 2.0, reason: Optional[str] = None, ignore_send_queue: bool = False) -> None: def disconnect(self, wait: float = 2.0, reason: Optional[str] = None, ignore_send_queue: bool = False) -> None:
"""Close the XML stream and wait for an acknowldgement from the server for """Close the XML stream and wait for an acknowldgement from the server for