diff options
| author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
| commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
| tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /synapse/http/endpoint.py | |
| parent | Copy dict in update_membership too (diff) | |
| parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
| download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'synapse/http/endpoint.py')
| -rw-r--r-- | synapse/http/endpoint.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index a97532162f..e2b99ef3bd 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -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) |