diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
| commit | 34ce2ca62f261311a9082b6e243eb6c584487025 (patch) | |
| tree | 0144c0f0a8231e2ea68e23c7d5676f48e42ee775 /synapse/handlers/events.py | |
| parent | Assign the AS ID from the database; replace old placeholder txn id. (diff) | |
| parent | When setting display name more graciously handle failures to update room state. (diff) | |
| download | synapse-34ce2ca62f261311a9082b6e243eb6c584487025.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 8d5f5c8499..d3297b7292 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -23,6 +23,7 @@ from synapse.events.utils import serialize_event from ._base import BaseHandler import logging +import random logger = logging.getLogger(__name__) @@ -72,6 +73,14 @@ class EventStreamHandler(BaseHandler): rm_handler = self.hs.get_handlers().room_member_handler room_ids = yield rm_handler.get_rooms_for_user(auth_user) + if timeout: + # If they've set a timeout set a minimum limit. + timeout = max(timeout, 500) + + # Add some randomness to this value to try and mitigate against + # thundering herds on restart. + timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) + with PreserveLoggingContext(): events, tokens = yield self.notifier.get_events_for( auth_user, room_ids, pagin_config, timeout |