summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 15:21:37 +0000
committerMatthew Hodgson <matthew@matrix.org>2016-12-31 15:21:37 +0000
commit555d702e3441e355d6b5e23702ab9505728dea71 (patch)
tree81611db6a9d26f43bd22c08127126d88f60b2b41 /synapse/federation/transport
parentMerge branch 'release-v0.18.6' into develop (diff)
downloadsynapse-555d702e3441e355d6b5e23702ab9505728dea71.tar.xz
limit total timeout for get_missing_events to 10s
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r--synapse/federation/transport/client.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py

index 491cdc29e1..915af34409 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py
@@ -386,7 +386,7 @@ class TransportLayerClient(object): @defer.inlineCallbacks @log_function def get_missing_events(self, destination, room_id, earliest_events, - latest_events, limit, min_depth): + latest_events, limit, min_depth, timeout): path = PREFIX + "/get_missing_events/%s" % (room_id,) content = yield self.client.post_json( @@ -397,7 +397,8 @@ class TransportLayerClient(object): "min_depth": int(min_depth), "earliest_events": earliest_events, "latest_events": latest_events, - } + }, + timeout=timeout, ) defer.returnValue(content)