summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 13:15:54 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 13:15:54 +0100
commitc9c82e8f4db6030668e5f806ba2e63667069af39 (patch)
treea1846566466e96d895f256e60aab267543e5ea7a
parentMerge pull request #314 from matrix-org/paul/event-redaction (diff)
parentCap the time to retry txns to appservices to 8.5 minutes (diff)
downloadsynapse-c9c82e8f4db6030668e5f806ba2e63667069af39.tar.xz
Merge pull request #320 from matrix-org/appservice-retry-cap
Cap the time to retry txns to appservices to 8.5 minutes
-rw-r--r--synapse/appservice/scheduler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
index 59b0b1f4ac..44dc2c4744 100644
--- a/synapse/appservice/scheduler.py
+++ b/synapse/appservice/scheduler.py
@@ -224,8 +224,8 @@ class _Recoverer(object):
         self.clock.call_later((2 ** self.backoff_counter), self.retry)
 
     def _backoff(self):
-        # cap the backoff to be around 18h => (2^16) = 65536 secs
-        if self.backoff_counter < 16:
+        # cap the backoff to be around 8.5min => (2^9) = 512 secs
+        if self.backoff_counter < 9:
             self.backoff_counter += 1
         self.recover()