summary refs log tree commit diff
path: root/synapse/replication/slave
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-03-15 12:16:55 +0000
committerRichard van der Hoff <richard@matrix.org>2017-03-15 12:16:55 +0000
commit29ed09e80a8c7ddeebe3f257a336e4c387a06c88 (patch)
tree9fb244c8c00d9d01cd0856f0efc028caf53f4688 /synapse/replication/slave
parentMerge pull request #2008 from matrix-org/erikj/notifier_stats (diff)
downloadsynapse-29ed09e80a8c7ddeebe3f257a336e4c387a06c88.tar.xz
Fix assertion to stop transaction queue getting wedged
... and update some docstrings to correctly reflect the types being used.

get_new_device_msgs_for_remote can return a long under some circumstances,
which was being stored in last_device_list_stream_id_by_dest, and was then
upsetting things on the next loop.
Diffstat (limited to 'synapse/replication/slave')
-rw-r--r--synapse/replication/slave/storage/_slaved_id_tracker.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/_slaved_id_tracker.py b/synapse/replication/slave/storage/_slaved_id_tracker.py
index 24b5c79d4a..9d1d173b2f 100644
--- a/synapse/replication/slave/storage/_slaved_id_tracker.py
+++ b/synapse/replication/slave/storage/_slaved_id_tracker.py
@@ -27,4 +27,9 @@ class SlavedIdTracker(object):
         self._current = (max if self.step > 0 else min)(self._current, new_id)
 
     def get_current_token(self):
+        """
+
+        Returns:
+            int
+        """
         return self._current