diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:43:11 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:43:11 +0100 |
| commit | 30a19daa02cf61d2a811efb0fd619ff48ce6bcf6 (patch) | |
| tree | c430aa536e76a2329831d04ae7d8d761ed2ec188 /synapse/replication/http/streams.py | |
| parent | use an upsert to update device_lists_outbound_last_success (diff) | |
| parent | Fix typing annotations in synapse/federation (#7382) (diff) | |
| download | synapse-30a19daa02cf61d2a811efb0fd619ff48ce6bcf6.tar.xz | |
Merge branch 'develop' into rav/upsert_for_device_list
Diffstat (limited to 'synapse/replication/http/streams.py')
| -rw-r--r-- | synapse/replication/http/streams.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/replication/http/streams.py b/synapse/replication/http/streams.py index f35cebc710..0459f582bf 100644 --- a/synapse/replication/http/streams.py +++ b/synapse/replication/http/streams.py @@ -50,6 +50,8 @@ class ReplicationGetStreamUpdates(ReplicationEndpoint): def __init__(self, hs): super().__init__(hs) + self._instance_name = hs.get_instance_name() + # We pull the streams from the replication steamer (if we try and make # them ourselves we end up in an import loop). self.streams = hs.get_replication_streamer().get_streams() @@ -67,7 +69,7 @@ class ReplicationGetStreamUpdates(ReplicationEndpoint): upto_token = parse_integer(request, "upto_token", required=True) updates, upto_token, limited = await stream.get_updates_since( - from_token, upto_token + self._instance_name, from_token, upto_token ) return ( |