diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-18 14:33:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-18 14:33:58 +0100 |
| commit | 880fb46de013fdf5b13340c25a9fadd020572162 (patch) | |
| tree | 7d3f13c105b5c158459b5d84fbc5c39736f9cd43 /synapse/handlers/_base.py | |
| parent | Add more doc string, reduce C+P boilerplate for getting room list (diff) | |
| parent | Don't bother sorting by the room_stream_ids, it shouldn't matter which order ... (diff) | |
| download | synapse-880fb46de013fdf5b13340c25a9fadd020572162.tar.xz | |
Merge branch 'notifier_performance' into markjh/presence_performance
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index ddc5c21e7d..833ff41377 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -105,7 +105,9 @@ class BaseHandler(object): if not suppress_auth: self.auth.check(event, auth_events=context.current_state) - yield self.store.persist_event(event, context=context) + (event_stream_id, max_stream_id) = yield self.store.persist_event( + event, context=context + ) federation_handler = self.hs.get_handlers().federation_handler @@ -142,7 +144,8 @@ class BaseHandler(object): with PreserveLoggingContext(): # Don't block waiting on waking up all the listeners. notify_d = self.notifier.on_new_room_event( - event, extra_users=extra_users + event, event_stream_id, max_stream_id, + extra_users=extra_users ) def log_failure(f): |