Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 00:34:47 -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

5
synapse/federation/federation_server.py
View file

@ -425,6 +425,7 @@ class FederationServer(FederationBase):
" limit: %d, min_depth: %d",
earliest_events, latest_events, limit, min_depth
)
missing_events = yield self.handler.on_get_missing_events(
origin, room_id, earliest_events, latest_events, limit, min_depth
)
@ -567,6 +568,9 @@ class FederationServer(FederationBase):
len(prevs - seen), pdu.room_id, list(prevs - seen)[:5]
)
# XXX: we set timeout to 10s to help workaround
# https://github.com/matrix-org/synapse/issues/1733
missing_events = yield self.get_missing_events(
origin,
pdu.room_id,
@ -574,6 +578,7 @@ class FederationServer(FederationBase):
latest_events=[pdu],
limit=10,
min_depth=min_depth,
timeout=10000,
)
# We want to sort these by depth so we process them and