summary refs log tree commit diff
path: root/synapse/storage
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/storage
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/storage')
-rw-r--r--synapse/storage/events.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 9242b0a84e..971f3211ac 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -65,6 +65,9 @@ class EventsStore(SQLBaseStore):
         except _RollbackButIsFineException:
             pass
 
+        max_persisted_id = yield self._stream_id_gen.get_max_token(self)
+        defer.returnValue((stream_ordering, max_persisted_id))
+
     @defer.inlineCallbacks
     def get_event(self, event_id, check_redacted=True,
                   get_prev_content=False, allow_rejected=False,