copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Catch socket.gaierror. Fixes #2840.

This commit is contained in:
junglecow 2006-12-27 22:45:23 +00:00
parent 447ec9ecd6
commit c16642c838
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/xmpp/transports_nb.py
View File

@ -300,24 +300,31 @@ class NonBlockingTcp(PlugIn, IdleObject):
self._server = server self._server = server
self.printed_error = False self.printed_error = False
self.state = 0 self.state = 0
success = False
try: try:
for ai in socket.getaddrinfo(server[0],server[1],socket.AF_UNSPEC,socket.SOCK_STREAM): for ai in socket.getaddrinfo(server[0],server[1],socket.AF_UNSPEC,socket.SOCK_STREAM):
try: try:
self._sock=socket.socket(*ai[:3]) self._sock=socket.socket(*ai[:3])
self._sock.setblocking(False) self._sock.setblocking(False)
self._server=ai[4] self._server=ai[4]
success = True
break break
except: except:
if sys.exc_value[0] == errno.EINPROGRESS: if sys.exc_value[0] == errno.EINPROGRESS:
success = True
break break
#for all errors, we try other addresses #for all errors, we try other addresses
continue continue
except socket.gaierror, e:
log.info("Lookup failure for %s: %s[%s]", self.getName(), e[1], repr(e[0]), exc_info=True)
except: except:
log.error("Exception trying to connect to %s:", self.getName(), exc_info=True) log.error("Exception trying to connect to %s:", self.getName(), exc_info=True)
#traceback.print_exc()
if not success:
if self.on_connect_failure: if self.on_connect_failure:
self.on_connect_failure() self.on_connect_failure()
return False return False
self.fd = self._sock.fileno() self.fd = self._sock.fileno()
self.idlequeue.plug_idle(self, True, False) self.idlequeue.plug_idle(self, True, False)
self.set_timeout(CONNECT_TIMEOUT_SECONDS) self.set_timeout(CONNECT_TIMEOUT_SECONDS)