summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-18 14:33:58 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-18 14:33:58 +0100
commit880fb46de013fdf5b13340c25a9fadd020572162 (patch)
tree7d3f13c105b5c158459b5d84fbc5c39736f9cd43 /synapse/handlers/sync.py
parentAdd more doc string, reduce C+P boilerplate for getting room list (diff)
parentDon't bother sorting by the room_stream_ids, it shouldn't matter which order ... (diff)
downloadsynapse-880fb46de013fdf5b13340c25a9fadd020572162.tar.xz
Merge branch 'notifier_performance' into markjh/presence_performance
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 35a62fda47..bd8c603681 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -92,7 +92,7 @@ class SyncHandler(BaseHandler): result = yield self.current_sync_for_user(sync_config, since_token) defer.returnValue(result) else: - def current_sync_callback(): + def current_sync_callback(before_token, after_token): return self.current_sync_for_user(sync_config, since_token) rm_handler = self.hs.get_handlers().room_member_handler