diff options
author | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
commit | de6170a13de2dbb3cbcfbf4a74b749f20b0cf061 (patch) | |
tree | b60043234119a3d215e0eca65913dd038167b551 /sleekxmpp/clientxmpp.py | |
parent | 65931bb384aada922c5287a3ad3cc62d04d6e676 (diff) | |
parent | 8dbe6f65462ec9b1a0506a00316415996f4d53d8 (diff) | |
download | slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.gz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.bz2 slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.xz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.zip |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
-rw-r--r-- | sleekxmpp/clientxmpp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index c08cd648..2554d299 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -163,11 +163,13 @@ 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." + \ " Using JID server name.") + except (dns.exception.Timeout,): + log.debug("DNS resolution timed out.") else: # Pick a random server, weighted by priority. |