github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-12-19 03:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

merged

Browse source
This commit is contained in:
Tom Nichols 2010-05-12 16:54:01 -04:00
commit a92075a659
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
*.pyc *.pyc
.project
build/ build/
*.swp *.swp

6
sleekxmpp/__init__.py
View file

@ -102,7 +102,7 @@ class ClientXMPP(basexmpp, XMLStream):
else: else:
logging.debug("Since no address is supplied, attempting SRV lookup.") logging.debug("Since no address is supplied, attempting SRV lookup.")
try: 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: except dns.resolver.NXDOMAIN:
logging.debug("No appropriate SRV record found. Using JID server name.") logging.debug("No appropriate SRV record found. Using JID server name.")
else: else:
@ -144,10 +144,14 @@ class ClientXMPP(basexmpp, XMLStream):
def reconnect(self): def reconnect(self):
logging.info("Reconnecting") logging.info("Reconnecting")
self.event("disconnected") self.event("disconnected")
self.authenticated = False
self.sessionstarted = False
XMLStream.reconnect(self) XMLStream.reconnect(self)
def disconnect(self, init=True, close=False, reconnect=False): def disconnect(self, init=True, close=False, reconnect=False):
self.event("disconnected") self.event("disconnected")
self.authenticated = False
self.sessionstarted = False
XMLStream.disconnect(self, reconnect) XMLStream.disconnect(self, reconnect)
def registerFeature(self, mask, pointer, breaker = False): def registerFeature(self, mask, pointer, breaker = False):

6
sleekxmpp/xmlstream/xmlstream.py
View file

@ -205,9 +205,11 @@ class XMLStream(object):
traceback.print_exc() traceback.print_exc()
self.disconnect(reconnect=True) self.disconnect(reconnect=True)
if self.state['reconnect']: if self.state['reconnect']:
self.state.set('connected', False)
self.state.set('processing', False)
self.reconnect() self.reconnect()
self.state.set('processing', False) else:
self.eventqueue.put(('quit', None, None)) self.eventqueue.put(('quit', None, None))
#self.__thread['readXML'] = threading.Thread(name='readXML', target=self.__readXML) #self.__thread['readXML'] = threading.Thread(name='readXML', target=self.__readXML)
#self.__thread['readXML'].start() #self.__thread['readXML'].start()
#self.__thread['spawnEvents'] = threading.Thread(name='spawnEvents', target=self.__spawnEvents) #self.__thread['spawnEvents'] = threading.Thread(name='spawnEvents', target=self.__spawnEvents)