summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-17 18:46:04 +0000
committerErik Johnston <erik@matrix.org>2015-11-17 18:46:04 +0000
commitb697a842a5d25fccf890bedeebdb85eed80fa732 (patch)
tree5161c402239d23d7cfd5813982e0df09d523a4a7 /synapse/federation
parentMerge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop (diff)
parentUpdate tests (diff)
downloadsynapse-b697a842a5d25fccf890bedeebdb85eed80fa732.tar.xz
Merge pull request #384 from matrix-org/erikj/shorter_retries
Only retry federation requests for a long time for background requests
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/client.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 3d59e1c650..0e0cb7ebc6 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -136,6 +136,7 @@ class TransportLayerClient(object):
             path=PREFIX + "/send/%s/" % transaction.transaction_id,
             data=json_data,
             json_data_callback=json_data_callback,
+            long_retries=True,
         )
 
         logger.debug(