diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-05 22:38:44 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-05 22:38:44 +0100 |
| commit | 124226731676ac769d6e54e80bc46a6e33569bde (patch) | |
| tree | f68bc1ba57855f9ee93db61606ee043b7e07bfda /synapse/replication/http/streams.py | |
| parent | changelog (diff) | |
| parent | Add backwards compatibility codepath to LoggingContext. (#7408) (diff) | |
| download | synapse-124226731676ac769d6e54e80bc46a6e33569bde.tar.xz | |
Merge branch 'release-v1.13.0' into rav/fix_dropped_messages
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 ( |