diff options
| author | Erik Johnston <erikj@jki.re> | 2018-09-19 11:45:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 11:45:11 +0100 |
| commit | cb016baa37936240ad0e3a90a1af68d7f0cfdf53 (patch) | |
| tree | 38552d721181b4ca5a2b0817dfb7d088d754c1b9 /synapse/http/client.py | |
| parent | update changelog for #3909 (diff) | |
| parent | Fixup (diff) | |
| download | synapse-cb016baa37936240ad0e3a90a1af68d7f0cfdf53.tar.xz | |
Merge pull request #3910 from matrix-org/erikj/update_timeout
Update to use new timeout function everywhere.
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index ec339a92ad..3d05f83b8c 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -43,7 +43,7 @@ from twisted.web.http_headers import Headers from synapse.api.errors import Codes, HttpResponseException, SynapseError from synapse.http import cancelled_to_request_timed_out_error, redact_uri from synapse.http.endpoint import SpiderEndpoint -from synapse.util.async_helpers import add_timeout_to_deferred +from synapse.util.async_helpers import timeout_deferred from synapse.util.caches import CACHE_SIZE_FACTOR from synapse.util.logcontext import make_deferred_yieldable @@ -99,7 +99,7 @@ class SimpleHttpClient(object): request_deferred = treq.request( method, uri, agent=self.agent, data=data, headers=headers ) - add_timeout_to_deferred( + request_deferred = timeout_deferred( request_deferred, 60, self.hs.get_reactor(), cancelled_to_request_timed_out_error, ) |