summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-24 15:04:49 +0000
committerErik Johnston <erik@matrix.org>2016-11-24 15:04:49 +0000
commitaaecffba3a3d111d05a6d4310653168113385947 (patch)
tree14618f0e4fa60e76c0987ca52829cbabee041d89 /synapse/federation
parentBump version and changelog (diff)
downloadsynapse-aaecffba3a3d111d05a6d4310653168113385947.tar.xz
Correctly handle 500's and 429 on federation
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transaction_queue.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index c94c74a67e..51b656d74a 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -462,6 +462,13 @@ class TransactionQueue(object):
                     code = e.code
                     response = e.response
 
+                    if e.code == 429 or 500 <= e.code:
+                        logger.info(
+                            "TX [%s] {%s} got %d response",
+                            destination, txn_id, code
+                        )
+                        raise e
+
                 logger.info(
                     "TX [%s] {%s} got %d response",
                     destination, txn_id, code