diff options
| author | Tom Nichols <tmnichols@gmail.com> | 2010-05-12 16:54:01 -0400 |
|---|---|---|
| committer | Tom Nichols <tmnichols@gmail.com> | 2010-05-12 16:54:01 -0400 |
| commit | a92075a659866f611e7eefca6bf92b56272e48bd (patch) | |
| tree | 8e4629284679f7e7d39ea0144c30c0bc8f989137 | |
| parent | 7552efee5c6d974087bc6883a5613d093ffd8bdc (diff) | |
| parent | e0c32b6d9bc357e79db04ea3126a614e038af928 (diff) | |
| download | slixmpp-a92075a659866f611e7eefca6bf92b56272e48bd.tar.gz slixmpp-a92075a659866f611e7eefca6bf92b56272e48bd.tar.bz2 slixmpp-a92075a659866f611e7eefca6bf92b56272e48bd.tar.xz slixmpp-a92075a659866f611e7eefca6bf92b56272e48bd.zip | |
merged
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | sleekxmpp/__init__.py | 6 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -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) |