diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-18 15:08:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-18 15:08:05 +0100 |
| commit | 4ef7a25c103d14ca4192b64100e0c6bb2a5fd9e9 (patch) | |
| tree | aaf0f39e4d44fd05d305d79faac2d8e53bc7b4fd | |
| parent | Merge pull request #732 from matrix-org/erikj/login (diff) | |
| parent | Lower timeout for make_membership_event (diff) | |
| download | synapse-4ef7a25c103d14ca4192b64100e0c6bb2a5fd9e9.tar.xz | |
Merge pull request #733 from matrix-org/erikj/make_member_timeout
Lower timeout for make_membership_event
| -rw-r--r-- | synapse/federation/transport/client.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 2237e3413c..cd2841c4db 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -179,7 +179,8 @@ class TransportLayerClient(object): content = yield self.client.get_json( destination=destination, path=path, - retry_on_dns_fail=True, + retry_on_dns_fail=False, + timeout=20000, ) defer.returnValue(content) |