Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-19 17:00:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

limit total timeout for get_missing_events to 10s

Browse source
This commit is contained in:
Matthew Hodgson 2016-12-31 15:21:37 +00:00 • committed by Mark Haines
parent 6028718b1a
commit eedf400d05
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/federation/federation_client.py
View file

@ -707,7 +707,7 @@ class FederationClient(FederationBase):
@defer.inlineCallbacks
def get_missing_events(self, destination, room_id, earliest_events_ids,
latest_events, limit, min_depth):
latest_events, limit, min_depth, timeout):
"""Tries to fetch events we are missing. This is called when we receive
an event without having received all of its ancestors.
@ -721,6 +721,7 @@ class FederationClient(FederationBase):
have all previous events for.
limit (int): Maximum number of events to return.
min_depth (int): Minimum depth of events tor return.
timeout (int): Max time to wait in ms
"""
try:
content = yield self.transport_layer.get_missing_events(
@ -730,6 +731,7 @@ class FederationClient(FederationBase):
latest_events=[e.event_id for e in latest_events],
limit=limit,
min_depth=min_depth,
timeout=timeout,
)
events = [