diff options
| author | Erik Johnston <erikj@jki.re> | 2016-11-24 15:27:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 15:27:19 +0000 |
| commit | 9192e593ec7a1501cda7df8ab79ecba586e5c3a2 (patch) | |
| tree | 0c373f5d2d3e923065e2372018f1c0a4371bd4a4 | |
| parent | Bump version and changelog (diff) | |
| parent | Use correct var (diff) | |
| download | synapse-9192e593ec7a1501cda7df8ab79ecba586e5c3a2.tar.xz | |
Merge pull request #1650 from matrix-org/erikj/respect_ratelimited
Correctly handle 500's and 429 on federation
| -rw-r--r-- | synapse/federation/transaction_queue.py | 7 | ||||
| -rw-r--r-- | synapse/util/retryutils.py | 2 |
2 files changed, 8 insertions, 1 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 diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py index 46ef5a8ec7..e2de7fce91 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py @@ -123,7 +123,7 @@ class RetryDestinationLimiter(object): def __exit__(self, exc_type, exc_val, exc_tb): valid_err_code = False if exc_type is not None and issubclass(exc_type, CodeMessageException): - valid_err_code = 0 <= exc_val.code < 500 + valid_err_code = exc_val.code != 429 and 0 <= exc_val.code < 500 if exc_type is None or valid_err_code: # We connected successfully. |