Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

2011-01-19 17:50:05 -05:00
parent 493df57035 897a9ac333
commit 6f4c2f22f3
1 changed files with 2 additions and 0 deletions
--- 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.