summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-28 14:11:16 +0000
committerErik Johnston <erik@matrix.org>2016-01-28 14:11:16 +0000
commit571a5663993fe68e85da76f9df47c2f215a84403 (patch)
tree96b9fac2af59411bb187c1aed2a21b7285ca3ac5 /synapse/handlers
parentAmalgamate incremental and full sync for user (diff)
downloadsynapse-571a5663993fe68e85da76f9df47c2f215a84403.tar.xz
Change load limit params
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 2bd83e4b5b..51ec4702db 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -608,8 +608,8 @@ class SyncHandler(BaseHandler): """ filtering_factor = 2 timeline_limit = sync_config.filter_collection.timeline_limit() - load_limit = timeline_limit * filtering_factor - max_repeat = 3 # Only try a few times per room, otherwise + load_limit = max(timeline_limit * filtering_factor, 10) + max_repeat = 5 # Only try a few times per room, otherwise room_key = now_token.room_key end_key = room_key