summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-16 13:22:52 -0500
committerLance Stout <lancestout@gmail.com>2011-01-16 13:22:52 -0500
commit2004ddd678fae9af590db2065478d2592bc2530b (patch)
tree175b9f92ad6d4fbdaa8d87e7da6fd274a7de6538 /sleekxmpp/basexmpp.py
parentcb85d4a5297b0eb6cc24052321b38f9f29f62004 (diff)
downloadslixmpp-2004ddd678fae9af590db2065478d2592bc2530b.tar.gz
slixmpp-2004ddd678fae9af590db2065478d2592bc2530b.tar.bz2
slixmpp-2004ddd678fae9af590db2065478d2592bc2530b.tar.xz
slixmpp-2004ddd678fae9af590db2065478d2592bc2530b.zip
Add StreamError stanza and a stream_error event.
Note that the stream may automatically attempt to reconnect when a stream error is received.
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index bc168b8c..3cf949a7 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -15,7 +15,7 @@ import logging
import sleekxmpp
from sleekxmpp import plugins
-from sleekxmpp.stanza import Message, Presence, Iq, Error
+from sleekxmpp.stanza import Message, Presence, Iq, Error, StreamError
from sleekxmpp.stanza.roster import Roster
from sleekxmpp.stanza.nick import Nick
from sleekxmpp.stanza.htmlim import HTMLIM
@@ -128,6 +128,10 @@ class BaseXMPP(XMLStream):
Callback('Presence',
MatchXPath("{%s}presence" % self.default_ns),
self._handle_presence))
+ self.register_handler(
+ Callback('Stream Error',
+ MatchXPath("{%s}error" % self.stream_ns),
+ self._handle_stream_error))
self.add_event_handler('presence_subscribe',
self._handle_subscribe)
@@ -135,9 +139,10 @@ class BaseXMPP(XMLStream):
self._handle_disconnected)
# Set up the XML stream with XMPP's root stanzas.
- self.registerStanza(Message)
- self.registerStanza(Iq)
- self.registerStanza(Presence)
+ self.register_stanza(Message)
+ self.register_stanza(Iq)
+ self.register_stanza(Presence)
+ self.register_stanza(StreamError)
# Initialize a few default stanza plugins.
register_stanza_plugin(Iq, Roster)
@@ -579,6 +584,9 @@ class BaseXMPP(XMLStream):
"""When disconnected, reset the roster"""
self.roster = {}
+ def _handle_stream_error(self, error):
+ self.event('stream_error', error)
+
def _handle_message(self, msg):
"""Process incoming message stanzas."""
self.event('message', msg)