summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 17:38:38 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 17:38:38 +0000
commitc8436b38a08c29fd7027e040564678ec8a635a14 (patch)
tree8d8c8b3773f439cc12430bfd7a058ff8d5cdaaf3 /synapse
parentRemove spurious self (diff)
downloadsynapse-c8436b38a08c29fd7027e040564678ec8a635a14.tar.xz
Only update destination_retry_timings if we have succeeded when retrying
Diffstat (limited to 'synapse')
-rw-r--r--synapse/util/retryutils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index 9ab119f29e..888b7ef2e9 100644
--- a/synapse/util/retryutils.py
+++ b/synapse/util/retryutils.py
@@ -89,6 +89,9 @@ class RetryDestinationLimiter(object):
 
         if exc_type is None and exc_val is None and exc_tb is None:
             # We connected successfully.
+            if not self.retry_interval:
+                return
+
             retry_last_ts = 0
             self.retry_interval = 0
         else: