jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve connection handling by not delaying until all DNS records are tried.

Browse Source
This commit is contained in:
Lance Stout 2012-03-29 23:42:50 -07:00
parent c1d36cad46
commit 4d4d1e0ee5
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sleekxmpp/xmlstream/xmlstream.py
View File

@ -421,9 +421,6 @@ class XMLStream(object):
def _connect(self, reattempt=True): def _connect(self, reattempt=True):
self.scheduler.remove('Session timeout check') self.scheduler.remove('Session timeout check')
self.stop.clear() self.stop.clear()
if self.default_domain:
self.address = self.pick_dns_answer(self.default_domain,
self.address[1])
if self.reconnect_delay is None or not reattempt: if self.reconnect_delay is None or not reattempt:
delay = 1.0 delay = 1.0
@ -443,6 +440,17 @@ class XMLStream(object):
self.stop.set() self.stop.set()
return False return False
if self.default_domain:
try:
self.address = self.pick_dns_answer(self.default_domain,
self.address[1])
except StopIteration:
log.debug("No remaining DNS records to try.")
self.dns_answers = None
if reattempt:
self.reconnect_delay = delay
return False
af = Socket.AF_INET af = Socket.AF_INET
if ':' in self.address[0]: if ':' in self.address[0]:
af = Socket.AF_INET6 af = Socket.AF_INET6
@ -499,8 +507,6 @@ class XMLStream(object):
domain = '[%s]' % domain domain = '[%s]' % domain
log.error(error_msg, domain, self.address[1], log.error(error_msg, domain, self.address[1],
serr.errno, serr.strerror) serr.errno, serr.strerror)
if reattempt:
self.reconnect_delay = delay
return False return False
def _connect_proxy(self): def _connect_proxy(self):
@ -919,14 +925,10 @@ class XMLStream(object):
if not self.dns_answers: if not self.dns_answers:
self.dns_answers = self.get_dns_records(domain, port) self.dns_answers = self.get_dns_records(domain, port)
try: if sys.version_info < (3, 0):
if sys.version_info < (3, 0): return self.dns_answers.next()
return self.dns_answers.next() else:
else: return next(self.dns_answers)
return next(self.dns_answers)
except StopIteration:
self.dns_answers = None
return (domain, port)
def add_event_handler(self, name, pointer, def add_event_handler(self, name, pointer,
threaded=False, disposable=False): threaded=False, disposable=False):
@ -1251,7 +1253,7 @@ class XMLStream(object):
self.exception(e) self.exception(e)
except Socket.error as serr: except Socket.error as serr:
self.event('socket_error', serr, direct=True) self.event('socket_error', serr, direct=True)
log.exception('Socket Error') log.error('Socket Error #%s: %s', serr.errno, serr.strerror)
except Exception as e: except Exception as e:
if not self.stop.is_set(): if not self.stop.is_set():
log.exception('Connection error.') log.exception('Connection error.')