summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-12-10 10:28:27 +0000
committerMatthew Hodgson <matthew@matrix.org>2014-12-10 10:28:27 +0000
commit0f4dcab238b029407080cb02cc2cf14e22d8fe89 (patch)
tree88448566493c7bb6bef3d07e816b2597ffb46ba5
parentAdd newline back in (diff)
downloadsynapse-0f4dcab238b029407080cb02cc2cf14e22d8fe89.tar.xz
turn back on per-request transaction retries, so that every time we try to hit a dead server we actually end up hammering 5 times :|
-rw-r--r--synapse/http/matrixfederationclient.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 16fb2adab5..fc5b5ab809 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -101,10 +101,9 @@ class MatrixFederationHttpClient(object):
             ]
         )
 
-        # was 5; for now, let's only try once at the HTTP layer and then
-        # rely on transaction-layer retries for exponential backoff and
-        # getting the message through.
-        retries_left = 0
+        # XXX: Would be much nicer to retry only at the transaction-layer
+        # (once we have reliable transactions in place)
+        retries_left = 5
 
         endpoint = self._getEndpoint(reactor, destination)