summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-28 22:49:31 +0000
committerErik Johnston <erik@matrix.org>2016-12-29 00:06:53 +0000
commit5b6672c66de693c390091c402f2dbb4a0f467aaf (patch)
tree15c8a44ab1c05a8f83ca2efb37286d05373adc66 /synapse/http/matrixfederationclient.py
parentMerge branch 'release-v0.18.5' of github.com:matrix-org/synapse (diff)
downloadsynapse-5b6672c66de693c390091c402f2dbb4a0f467aaf.tar.xz
Wrap connections in an N minute timeout to ensure they get reaped correctly
Diffstat (limited to '')
-rw-r--r--synapse/http/matrixfederationclient.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index d5970c05a8..da98d2d666 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -61,6 +61,11 @@ MAX_LONG_RETRIES = 10
 MAX_SHORT_RETRIES = 3
 
 
+def test(conn):
+    conn.loseConnection()
+    return conn
+
+
 class MatrixFederationEndpointFactory(object):
     def __init__(self, hs):
         self.tls_server_context_factory = hs.tls_server_context_factory
@@ -88,7 +93,8 @@ class MatrixFederationHttpClient(object):
         self.signing_key = hs.config.signing_key[0]
         self.server_name = hs.hostname
         pool = HTTPConnectionPool(reactor)
-        pool.maxPersistentPerHost = 10
+        pool.maxPersistentPerHost = 5
+        pool.cachedConnectionTimeout = 2 * 60
         self.agent = Agent.usingEndpointFactory(
             reactor, MatrixFederationEndpointFactory(hs), pool=pool
         )