diff options
| author | Erik Johnston <erikj@jki.re> | 2018-09-14 16:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 16:58:44 +0100 |
| commit | 3e6e94fe9f2f543de923f33ada5cb19f93428ded (patch) | |
| tree | cab11a3071e6ff10dab205a7f0dd276d60ba5736 /synapse/http/matrixfederationclient.py | |
| parent | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics (diff) | |
| parent | fix (diff) | |
| download | synapse-3e6e94fe9f2f543de923f33ada5cb19f93428ded.tar.xz | |
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
timeouts 2: electric boogaloo
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index c3542b9353..da16b5dd8c 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -92,6 +92,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( @@ -222,7 +223,8 @@ class MatrixFederationHttpClient(object): headers=Headers(headers_dict), data=data, agent=self.agent, - reactor=self.hs.get_reactor() + reactor=self.hs.get_reactor(), + unbuffered=True ) request_deferred.addTimeout(_sec_timeout, self.hs.get_reactor()) |