diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-22 09:37:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 09:37:10 +0100 |
| commit | 77ac14b960cb8daef76062ce85fc0427749b48af (patch) | |
| tree | 4a2b3af0e0404640a2ef251030cd3c2591a1d6ba /synapse/http/client.py | |
| parent | Populate synapse_federation_client_sent_pdu_destinations:count again (#3386) (diff) | |
| download | synapse-77ac14b960cb8daef76062ce85fc0427749b48af.tar.xz | |
Pass around the reactor explicitly (#3385)
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 8064a84c5c..46ffb41de1 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -98,8 +98,8 @@ class SimpleHttpClient(object): method, uri, *args, **kwargs ) add_timeout_to_deferred( - request_deferred, - 60, cancelled_to_request_timed_out_error, + request_deferred, 60, self.hs.get_reactor(), + cancelled_to_request_timed_out_error, ) response = yield make_deferred_yieldable(request_deferred) @@ -115,7 +115,7 @@ class SimpleHttpClient(object): "Error sending request to %s %s: %s %s", method, redact_uri(uri), type(e).__name__, e.message ) - raise e + raise @defer.inlineCallbacks def post_urlencoded_get_json(self, uri, args={}, headers=None): |