From 27ca009b0abdc060f62b694f0c507abbcb545a0a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 26 Nov 2018 16:25:06 +0000 Subject: [PATCH] Reenable retries for sending transactions --- synapse/federation/transport/client.py | 1 - synapse/http/matrixfederationclient.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 42ed61470f..5e8bf8ac76 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -175,7 +175,6 @@ class TransportLayerClient(object): data=json_data, json_data_callback=json_data_callback, long_retries=False, - timeout=10000, backoff_on_404=True, # If we get a 404 the other side has gone ) diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index afdb980c72..110b682a6d 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -196,7 +196,7 @@ class MatrixFederationHttpClient(object): self.clock = hs.get_clock() self._store = hs.get_datastore() self.version_string_bytes = hs.version_string.encode('ascii') - self.default_timeout = 30 + self.default_timeout = 20 def schedule(x): reactor.callLater(_EPSILON, x)