summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 03:21:47 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-14 03:21:47 +1000
commit63755fa4c25f120941aba24d6192815313d12ea7 (patch)
tree265f33a3e38002175aba4b2da98c54c9b301ed46
parentMerge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 (diff)
downloadsynapse-63755fa4c25f120941aba24d6192815313d12ea7.tar.xz
we do that higher up
Diffstat (limited to '')
-rw-r--r--synapse/http/matrixfederationclient.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index cdbe27eb37..d1a6e87706 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -91,6 +91,7 @@ class MatrixFederationHttpClient(object):
         self.server_name = hs.hostname
         reactor = hs.get_reactor()
         pool = HTTPConnectionPool(reactor)
+        pool.retryAutomatically = False
         pool.maxPersistentPerHost = 5
         pool.cachedConnectionTimeout = 2 * 60
         self.agent = Agent.usingEndpointFactory(