diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2017-01-05 11:53:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 11:53:15 +0000 |
| commit | 5175094707ca4994d1ff5948b99a532c1d9a3d16 (patch) | |
| tree | 8d0a392577e2ad482f798c8f66f0a8fa19f830fa /synapse/federation/transport/client.py | |
| parent | Merge branch 'release-v0.18.6' into develop (diff) | |
| parent | fix comment (diff) | |
| download | synapse-5175094707ca4994d1ff5948b99a532c1d9a3d16.tar.xz | |
Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events
limit total timeout for get_missing_events to 10s
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 5 |
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) |