summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--sleekxmpp/__init__.py6
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py6
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index c01a14f7..15997ce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
*.pyc
+.project
build/
*.swp
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py
index 4a211186..5ba38090 100644
--- a/sleekxmpp/__init__.py
+++ b/sleekxmpp/__init__.py
@@ -102,7 +102,7 @@ class ClientXMPP(basexmpp, XMLStream):
else:
logging.debug("Since no address is supplied, attempting SRV lookup.")
try:
- answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.domain, "SRV")
+ answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server)
except dns.resolver.NXDOMAIN:
logging.debug("No appropriate SRV record found. Using JID server name.")
else:
@@ -144,10 +144,14 @@ class ClientXMPP(basexmpp, XMLStream):
def reconnect(self):
logging.info("Reconnecting")
self.event("disconnected")
+ self.authenticated = False
+ self.sessionstarted = False
XMLStream.reconnect(self)
def disconnect(self, init=True, close=False, reconnect=False):
self.event("disconnected")
+ self.authenticated = False
+ self.sessionstarted = False
XMLStream.disconnect(self, reconnect)
def registerFeature(self, mask, pointer, breaker = False):
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 810be295..54fac422 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -205,9 +205,11 @@ class XMLStream(object):
traceback.print_exc()
self.disconnect(reconnect=True)
if self.state['reconnect']:
+ self.state.set('connected', False)
+ self.state.set('processing', False)
self.reconnect()
- self.state.set('processing', False)
- self.eventqueue.put(('quit', None, None))
+ else:
+ self.eventqueue.put(('quit', None, None))
#self.__thread['readXML'] = threading.Thread(name='readXML', target=self.__readXML)
#self.__thread['readXML'].start()
#self.__thread['spawnEvents'] = threading.Thread(name='spawnEvents', target=self.__spawnEvents)