summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-03 15:22:56 +0100
committerErik Johnston <erik@matrix.org>2017-04-03 15:22:56 +0100
commit0a6a966e2b86ebe423709c030634c04c1093ab0b (patch)
tree294cebd046a6d6d0bbcd4da3c682d62b1ce40e9d /synapse
parentUse callbacks to notify tcp replication rather than deferreds (diff)
downloadsynapse-0a6a966e2b86ebe423709c030634c04c1093ab0b.tar.xz
Always advance stream tokens
Diffstat (limited to 'synapse')
-rw-r--r--synapse/replication/tcp/resource.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py
index b70fa7334f..0d7ea57318 100644
--- a/synapse/replication/tcp/resource.py
+++ b/synapse/replication/tcp/resource.py
@@ -121,7 +121,10 @@ class ReplicationStreamer(object):
         is currently being executed, so that nothing gets missed
         """
         if not self.connections:
-            # Don't bother if nothing is listening
+            # Don't bother if nothing is listening. We still need to advance
+            # the stream tokens otherwise they'll fall beihind forever
+            for stream in self.streams:
+                stream.advance_current_token()
             return
 
         # If we're in the process of checking for new updates, mark that fact