diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-04 14:29:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-04 14:35:02 +0000 |
| commit | ed61a491692635191b93f075db207a121eb37b66 (patch) | |
| tree | 15529916444eca9cc590106ed5a05008fa15f1db /synapse/federation | |
| parent | Merge pull request #598 from Rugvip/invite-state (diff) | |
| download | synapse-ed61a491692635191b93f075db207a121eb37b66.tar.xz | |
Add profile information to invites
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transport/client.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index e30e2da58d..83c1f46586 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -114,7 +114,7 @@ class FederationClient(FederationBase): @log_function def make_query(self, destination, query_type, args, - retry_on_dns_fail=True): + retry_on_dns_fail=False): """Sends a federation Query to a remote homeserver of the given type and arguments. diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 2b5d40ea7f..2237e3413c 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -160,6 +160,7 @@ class TransportLayerClient(object): path=path, args=args, retry_on_dns_fail=retry_on_dns_fail, + timeout=10000, ) defer.returnValue(content) |