diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-02 14:09:15 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-02 14:26:13 +0100 |
| commit | 574377636ee4eafba50580fc4d7a1d0793774332 (patch) | |
| tree | 2d8bcaafa39c69dbece39f0d5c28503ebf1efe36 /synapse/handlers/directory.py | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-574377636ee4eafba50580fc4d7a1d0793774332.tar.xz | |
Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index cec7737e09..a56830d520 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -18,7 +18,6 @@ from twisted.internet import defer from ._base import BaseHandler from synapse.api.errors import SynapseError -from synapse.http.client import MatrixHttpClient from synapse.api.events.room import RoomAliasesEvent import logging @@ -98,8 +97,8 @@ class DirectoryHandler(BaseHandler): query_type="directory", args={ "room_alias": room_alias.to_string(), - MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES: False - } + }, + retry_on_dns_fail=False, ) if result and "room_id" in result and "servers" in result: |