diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
| commit | 056f0991262902e22f0414e17c01198e1606384a (patch) | |
| tree | fa365dc1aef28f86499122d8b9176c03dd95e863 /synapse/federation/federation_server.py | |
| parent | Batch process handling state groups (diff) | |
| parent | Fix manhole on py3 (pt 2) (#4067) (diff) | |
| download | synapse-056f0991262902e22f0414e17c01198e1606384a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 819e8f7331..4efe95faa4 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -507,19 +507,19 @@ class FederationServer(FederationBase): @defer.inlineCallbacks @log_function def on_get_missing_events(self, origin, room_id, earliest_events, - latest_events, limit, min_depth): + latest_events, limit): with (yield self._server_linearizer.queue((origin, room_id))): origin_host, _ = parse_server_name(origin) yield self.check_server_matches_acl(origin_host, room_id) logger.info( "on_get_missing_events: earliest_events: %r, latest_events: %r," - " limit: %d, min_depth: %d", - earliest_events, latest_events, limit, min_depth + " limit: %d", + earliest_events, latest_events, limit, ) missing_events = yield self.handler.on_get_missing_events( - origin, room_id, earliest_events, latest_events, limit, min_depth + origin, room_id, earliest_events, latest_events, limit, ) if len(missing_events) < 5: |