summary refs log tree commit diff
path: root/synapse/util
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/util
parentBump version and changelog (diff)
downloadsynapse-aaecffba3a3d111d05a6d4310653168113385947.tar.xz
Correctly handle 500's and 429 on federation
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/retryutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index 46ef5a8ec7..218029e8a8 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 = valid_err_code != 429 and 0 <= exc_val.code < 500
 
         if exc_type is None or valid_err_code:
             # We connected successfully.