diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2010-05-27 04:58:57 -0700 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2010-05-27 04:58:57 -0700 |
| commit | 3a28f9e5d247b9124e0d14c26c2a6e79aaee86ff (patch) | |
| tree | 0d0cbd55785b8c06a86268e6de66201924f3dd55 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | 0bda5fd3f28da14478db87c98fb89f647994deaa (diff) | |
| download | slixmpp-3a28f9e5d247b9124e0d14c26c2a6e79aaee86ff.tar.gz slixmpp-3a28f9e5d247b9124e0d14c26c2a6e79aaee86ff.tar.bz2 slixmpp-3a28f9e5d247b9124e0d14c26c2a6e79aaee86ff.tar.xz slixmpp-3a28f9e5d247b9124e0d14c26c2a6e79aaee86ff.zip | |
added pubsub state stanzas and scheduled events
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 96b47411..7fbc5f9e 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -180,6 +180,7 @@ class XMLStream(object): self.state.set('reconnect', False) self.disconnect() self.run = False + self.scheduler.run = False self.eventqueue.put(('quit', None, None)) return except CloseStream: @@ -226,6 +227,7 @@ class XMLStream(object): edepth += -1 if edepth == 0 and event == b'end': self.disconnect(reconnect=self.state['reconnect']) + logging.debug("Ending readXML loop") return False elif edepth == 1: #self.xmlin.put(xmlobj) @@ -234,11 +236,13 @@ class XMLStream(object): except RestartStream: return True except CloseStream: + logging.debug("Ending readXML loop") return False if root: root.clear() if event == b'start': edepth += 1 + logging.debug("Ending readXML loop") def _sendThread(self): while self.run: @@ -268,6 +272,7 @@ class XMLStream(object): logging.debug("Disconnecting...") self.state.set('disconnecting', True) self.run = False + self.scheduler.run = False if self.state['connected']: self.sendRaw(self.stream_footer) time.sleep(1) @@ -339,7 +344,8 @@ class XMLStream(object): args[0].exception(e) elif etype == 'schedule': try: - handler.run(*args) + logging.debug(args) + handler(*args[0]) except: logging.error(traceback.format_exc()) elif etype == 'quit': |