summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Ryzhov <anton@ryzhov.me>2013-03-28 21:52:18 +0400
committerAnton Ryzhov <anton@ryzhov.me>2013-03-28 22:09:33 +0400
commita0c77c04a5d7185fe01729961d05eccdba4d37e7 (patch)
tree4d97209627fd7729fbec613f060ae9012a3159f3
parent620ee9719f06043a8865dd74f7ce1231ae16ba53 (diff)
downloadslixmpp-a0c77c04a5d7185fe01729961d05eccdba4d37e7.tar.gz
slixmpp-a0c77c04a5d7185fe01729961d05eccdba4d37e7.tar.bz2
slixmpp-a0c77c04a5d7185fe01729961d05eccdba4d37e7.tar.xz
slixmpp-a0c77c04a5d7185fe01729961d05eccdba4d37e7.zip
XMLStream `proxy_error` event duplicated with `connection_failed`
SASL `no_auth` event duplicated with `failed_auth`
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py1
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index eb161be8..2ed3e00b 100644
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@@ -171,6 +171,7 @@ class FeatureMechanisms(BasePlugin):
except sasl.SASLNoAppropriateMechanism:
log.error("No appropriate login method.")
self.xmpp.event("no_auth", direct=True)
+ self.xmpp.event("failed_auth", direct=True)
self.attempted_mechs = set()
return self.xmpp.disconnect()
except StringPrepError:
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index e55e78e7..f9a9c5a5 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -610,6 +610,7 @@ class XMLStream(object):
lines = resp.split('\r\n')
if '200' not in lines[0]:
self.event('proxy_error', resp)
+ self.event('connection_failed', direct=True)
log.error('Proxy Error: %s', lines[0])
return False