summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-02 11:08:07 +0100
committerErik Johnston <erik@matrix.org>2019-10-02 11:08:07 +0100
commitecd254bc4966c0560fcb65620fe784134484c020 (patch)
treebf847ae3d74b0e79769dc26a3f9787b78dbf9e4e /synapse/util
parentMerge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... (diff)
parentMerge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings (diff)
downloadsynapse-ecd254bc4966c0560fcb65620fe784134484c020.tar.xz
Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop
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 a5f2fbef5c..af69587196 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py
@@ -29,7 +29,7 @@ MIN_RETRY_INTERVAL = 10 * 60 * 1000 RETRY_MULTIPLIER = 5 # a cap on the backoff. (Essentially none) -MAX_RETRY_INTERVAL = 2 ** 63 +MAX_RETRY_INTERVAL = 2 ** 62 class NotRetryingDestination(Exception):