diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-19 17:20:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-19 17:20:25 +0100 |
| commit | 88acb99747c05f43f4563774f498993b27915493 (patch) | |
| tree | 3184c8b912fdf11d29f7254ab879447f677e353b /synapse/app/synchrotron.py | |
| parent | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-88acb99747c05f43f4563774f498993b27915493.tar.xz | |
Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 07d3d047c6..46d390fd0f 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -242,6 +242,9 @@ class SynchrotronTyping(object): self._room_typing = {} def stream_positions(self): + # We must update this typing token from the response of the previous + # sync. In particular, the stream id may "reset" back to zero/a low + # value which we *must* use for the next replication request. return {"typing": self._latest_room_serial} def process_replication(self, result): @@ -462,6 +465,7 @@ def start(config_options): def start(): ss.get_datastore().start_profiling() ss.replicate() + ss.get_state_handler().start_caching() reactor.callWhenRunning(start) |