diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-01-19 17:50:05 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-19 17:50:05 -0500 |
| commit | 6f4c2f22f3688395b0fa173cee2afe543832c2cd (patch) | |
| tree | 745b08312d1cb48f90fe0be99c763282e361436f /sleekxmpp/clientxmpp.py | |
| parent | 493df570353fbeff288d6ee61fb0842622443967 (diff) | |
| parent | 897a9ac3335ef42e454aba44346d8702564ab48f (diff) | |
| download | slixmpp-6f4c2f22f3688395b0fa173cee2afe543832c2cd.tar.gz slixmpp-6f4c2f22f3688395b0fa173cee2afe543832c2cd.tar.bz2 slixmpp-6f4c2f22f3688395b0fa173cee2afe543832c2cd.tar.xz slixmpp-6f4c2f22f3688395b0fa173cee2afe543832c2cd.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 2 |
1 files changed, 2 insertions, 0 deletions
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. |