From 914f1eafac9fe600e4d83a2b9bb6dac6d1dcb707 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 15 Apr 2016 11:22:23 +0100
Subject: 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.
---
 synapse/federation/transport/client.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit 1.4.1