diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-12 11:14:56 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-12 11:14:56 +0100 |
| commit | 4a32d25d4c97b10f74e636d46b312ba6b660987b (patch) | |
| tree | 53c35423e6469adc87cc5b213d5b960fd143277c /synapse/app | |
| parent | Fix unit tests (diff) | |
| parent | Merge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highligh... (diff) | |
| download | synapse-4a32d25d4c97b10f74e636d46b312ba6b660987b.tar.xz | |
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/synchrotron.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 07d3d047c6..dbaa48035d 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): |