Merge pull request #320 from matrix-org/appservice-retry-cap

Cap the time to retry txns to appservices to 8.5 minutes
matrix-org · Oct 22, 2015 · c9c82e8 · c9c82e8
2 parents 87da71b + 4dec901
commit c9c82e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
@@ -224,8 +224,8 @@ def recover(self):
         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()