summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-12 10:10:15 +0100
committerGitHub <noreply@github.com>2016-09-12 10:10:15 +0100
commitd1c217c823732e0af818148389d94749611aadee (patch)
treebc869b71bdd4d939c6f439666e65134ba0e775e5 /synapse/app
parentMerge pull request #1095 from matrix-org/erikj/batch_edus (diff)
parentComment (diff)
downloadsynapse-d1c217c823732e0af818148389d94749611aadee.tar.xz
Merge pull request #1097 from matrix-org/erikj/replication_typing_rest
Correctly handle typing stream id resetting
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/synchrotron.py3
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):