diff options
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 39360310..e047dbd7 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -1084,7 +1084,12 @@ class XMLStream(object): # new connections. if not self.session_started_event.is_set(): self.send_raw(self.stream_header, now=True) - self.__read_xml() + if not self.__read_xml(): + # If the server terminated the stream, end processing + break + except SyntaxError as e: + log.error("Error reading from XML stream.") + self.exception(e) except KeyboardInterrupt: log.debug("Keyboard Escape Detected in _process") self.stop.set() @@ -1115,40 +1120,35 @@ class XMLStream(object): """ depth = 0 root = None - try: - for (event, xml) in ET.iterparse(self.filesocket, - (b'end', b'start')): - if event == b'start': - if depth == 0: - # We have received the start of the root element. - root = xml - # Perform any stream initialization actions, such - # as handshakes. - self.stream_end_event.clear() - self.start_stream_handler(root) - depth += 1 - if event == b'end': - depth -= 1 - if depth == 0: - # The stream's root element has closed, - # terminating the stream. - log.debug("End of stream recieved") - self.stream_end_event.set() - return False - elif depth == 1: - # We only raise events for stanzas that are direct - # children of the root element. - try: - self.__spawn_event(xml) - except RestartStream: - return True - if root: - # Keep the root element empty of children to - # save on memory use. - root.clear() - except SyntaxError: - log.error("Error reading from XML stream.") - self.disconnect(self.auto_reconnect) + for event, xml in ET.iterparse(self.filesocket, (b'end', b'start')): + if event == b'start': + if depth == 0: + # We have received the start of the root element. + root = xml + # Perform any stream initialization actions, such + # as handshakes. + self.stream_end_event.clear() + self.start_stream_handler(root) + depth += 1 + if event == b'end': + depth -= 1 + if depth == 0: + # The stream's root element has closed, + # terminating the stream. + log.debug("End of stream recieved") + self.stream_end_event.set() + return False + elif depth == 1: + # We only raise events for stanzas that are direct + # children of the root element. + try: + self.__spawn_event(xml) + except RestartStream: + return True + if root is not None: + # Keep the root element empty of children to + # save on memory use. + root.clear() log.debug("Ending read XML loop") def _build_stanza(self, xml, default_ns=None): |