dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-06-07 06:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler

Browse Source 
Fix error handling on dns lookup
This commit is contained in:
Richard van der Hoff
2017-11-27 12:19:18 +00:00
committed by GitHub
parent 04bb79f139 8b38096a89
commit df6c72ede3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse/http/endpoint.py
+4 -2
View File
@@ -362,8 +362,10 @@ def _get_hosts_for_srv_record(dns_client, host):
return res
# no logcontexts here, so we can safely fire these off and gatherResults
d1 = dns_client.lookupAddress(host).addCallbacks(cb, eb)
d2 = dns_client.lookupIPV6Address(host).addCallbacks(cb, eb)
d1 = dns_client.lookupAddress(host).addCallbacks(
cb, eb, errbackArgs=("A", ))
d2 = dns_client.lookupIPV6Address(host).addCallbacks(
cb, eb, errbackArgs=("AAAA", ))
results = yield defer.DeferredList(
[d1, d2], consumeErrors=True)