summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 13:16:35 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 13:16:35 +0100
commit8a98f0dc5b2dceba596f7d25895969a88c223053 (patch)
tree9e62f8773a32fc24f1951a2601fee1f9afabc178 /synapse/appservice
parentPEP8 (diff)
parentMerge pull request #320 from matrix-org/appservice-retry-cap (diff)
downloadsynapse-8a98f0dc5b2dceba596f7d25895969a88c223053.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/appservice')
-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()