summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-15 11:22:23 +0100
committerErik Johnston <erik@matrix.org>2016-04-15 11:22:23 +0100
commit914f1eafac9fe600e4d83a2b9bb6dac6d1dcb707 (patch)
tree787cd6184439c4a1b6f048e6b7863be0bf1aab7b
parentMerge pull request #731 from matrix-org/erikj/timed_otu (diff)
downloadsynapse-914f1eafac9fe600e4d83a2b9bb6dac6d1dcb707.tar.xz
Lower timeout for make_membership_event
Calls to make_membership_event are done in response to client requests,
and so should not be retried over long timeframes.
Diffstat (limited to '')
-rw-r--r--synapse/federation/transport/client.py3
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)