From 897a9ac3335ef42e454aba44346d8702564ab48f Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 20 Jan 2011 04:23:00 +0800 Subject: Do not traceback when DNS resolution time out. Just log that the resolution timed out, and fall back to the hostname from the JID in this case --- sleekxmpp/clientxmpp.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sleekxmpp/clientxmpp.py') diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 734c9a14..b8668107 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -169,6 +169,8 @@ class ClientXMPP(BaseXMPP): except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): log.debug("No appropriate SRV record found." + \ " Using JID server name.") + except (dns.exception.Timeout,): + log.debug("DNS resolution timed out.") else: # Pick a random server, weighted by priority. -- cgit v1.2.3 From c3be6ea0b2141fe86b9aa0c2701e43b72f86ae30 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sun, 23 Jan 2011 01:47:22 +0800 Subject: My hunch is that these should also be updated. --- sleekxmpp/clientxmpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp/clientxmpp.py') diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index b8668107..a1813985 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -164,7 +164,7 @@ class ClientXMPP(BaseXMPP): log.debug("Since no address is supplied," + \ "attempting SRV lookup.") try: - xmpp_srv = "_xmpp-client._tcp.%s" % self.server + xmpp_srv = "_xmpp-client._tcp.%s" % self.boundjid.host answers = dns.resolver.query(xmpp_srv, dns.rdatatype.SRV) except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): log.debug("No appropriate SRV record found." + \ -- cgit v1.2.3