diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-04 15:40:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 15:40:51 +0100 |
| commit | a76886726bbe68bcc7781ebb457cb1dc728efc4e (patch) | |
| tree | 4682c31a49aa26abbbeebf7088e3bba3316c8a86 /synapse/replication/tcp/resource.py | |
| parent | Fiddle tcp replication logging (diff) | |
| parent | Advance replication streams even if nothing is listening (diff) | |
| download | synapse-a76886726bbe68bcc7781ebb457cb1dc728efc4e.tar.xz | |
Merge pull request #2098 from matrix-org/erikj/repl_tcp_fix
Advance replication streams even if nothing is listening
Diffstat (limited to 'synapse/replication/tcp/resource.py')
| -rw-r--r-- | synapse/replication/tcp/resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py index 0d7ea57318..8b2c4c3043 100644 --- a/synapse/replication/tcp/resource.py +++ b/synapse/replication/tcp/resource.py @@ -124,7 +124,7 @@ class ReplicationStreamer(object): # 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() + stream.discard_updates_and_advance() return # If we're in the process of checking for new updates, mark that fact |