diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-04 10:07:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 10:07:57 +0100 |
| commit | 27cc627e425a4a1d6baf3887b435005a571c2271 (patch) | |
| tree | a5fa797ac7e65f85cae52cccd88451e5672257c6 /synapse/replication/resource.py | |
| parent | Merge pull request #2095 from matrix-org/rav/cull_log_preserves (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s... (diff) | |
| download | synapse-27cc627e425a4a1d6baf3887b435005a571c2271.tar.xz | |
Merge pull request #2082 from matrix-org/erikj/repl_tcp_server
Replace HTTP replication with TCP replication (Server side part)
Diffstat (limited to 'synapse/replication/resource.py')
| -rw-r--r-- | synapse/replication/resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index 03930fe958..abd3fe7665 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -489,7 +489,7 @@ class ReplicationResource(Resource): if federation is not None and federation != current_position: federation_rows = self.federation_sender.get_replication_rows( - federation, limit, federation_ack=federation_ack, + federation, current_position, limit, federation_ack=federation_ack, ) upto_token = _position_from_rows(federation_rows, current_position) writer.write_header_and_rows("federation", federation_rows, ( @@ -504,7 +504,7 @@ class ReplicationResource(Resource): if device_lists is not None and device_lists != current_position: changes = yield self.store.get_all_device_list_changes_for_remotes( - device_lists, + device_lists, current_position, ) writer.write_header_and_rows("device_lists", changes, ( "position", "user_id", "destination", |