diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 10:50:43 +0100 |
| commit | 5e7883ec194f87eab4f577022e7bad8de4fb0203 (patch) | |
| tree | 1deb9b8ee772c192f57ae20504c14feed08850e4 /synapse/storage/events.py | |
| parent | Do work in parellel when joining a room (diff) | |
| parent | SYN-383: Extract the response list from 'server_keys' in the response JSON as... (diff) | |
| download | synapse-5e7883ec194f87eab4f577022e7bad8de4fb0203.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index afdf0f7193..4fee155234 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -69,6 +69,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, |