summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-31 13:31:15 +0000
committerErik Johnston <erik@matrix.org>2016-01-31 13:31:15 +0000
commitd98a9f25839ede491201714dc7a9d661cd4ff8f3 (patch)
tree5acd54cb2d7cdd95af685fdf52d64f868982cdbd
parentMerge pull request #542 from matrix-org/erikj/cache_fix (diff)
downloadsynapse-d98a9f25839ede491201714dc7a9d661cd4ff8f3.tar.xz
Don't use before_token. Its wrong. Use actual limit.
-rw-r--r--synapse/notifier.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 32bd16661d..29965a9ab5 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -363,7 +363,7 @@ class Notifier(object):
         @defer.inlineCallbacks
         def check_for_updates(before_token, after_token):
             if not after_token.is_after(before_token):
-                defer.returnValue(EventStreamResult([], (before_token, before_token)))
+                defer.returnValue(EventStreamResult([], (from_token, from_token)))
 
             events = []
             end_token = from_token
@@ -376,14 +376,11 @@ class Notifier(object):
                     continue
                 if only_keys and name not in only_keys:
                     continue
-                if limit:
-                    new_limit = max(limit * 2, 10)
-                else:
-                    new_limit = 10
+
                 new_events, new_key = yield source.get_new_events(
                     user=user,
                     from_key=getattr(from_token, keyname),
-                    limit=new_limit,
+                    limit=limit,
                     is_guest=is_peeking,
                     room_ids=room_ids,
                 )