diff options
| author | Erik Johnston <erik@matrix.org> | 2020-03-24 16:00:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-03-24 16:00:54 +0000 |
| commit | e4c5b1d9d6be6a38224d274e8f38099d0ab550ac (patch) | |
| tree | e1f059a3808afdc95e6b6a14ed6b6057ffb931e2 /synapse | |
| parent | Remove import loop (diff) | |
| download | synapse-e4c5b1d9d6be6a38224d274e8f38099d0ab550ac.tar.xz | |
Review comments
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 1 | ||||
| -rw-r--r-- | synapse/replication/tcp/streams/_base.py | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index 67de5c3e7e..f81d2e2442 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -648,7 +648,6 @@ class ClientReplicationStreamProtocol(BaseReplicationStreamProtocol): # We've now caught up to position sent to us, notify handler. await self.handler.on_position(cmd.stream_name, cmd.token) - # We're now up to date wit the stream self.streams_connecting.discard(cmd.stream_name) if not self.streams_connecting: self.handler.finished_connecting() diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py index d5b9c2831b..d7e9371a00 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -105,9 +105,6 @@ class Stream(object): to fetch. """ - if from_token in ("NOW", "now"): - return [], upto_token, False - from_token = int(from_token) if from_token == upto_token: |