summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-03-07 16:01:48 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-03-07 16:01:48 +0100
commit552c720753fc9dd0560db621c5aec23b39be10eb (patch)
tree6cfef49f577f63bb01287e62c872ae2b716e6f26
parentbb45e12dae09c40f20a7eba1fbb01e9985f590fd (diff)
parent487509e239a5e70a32d54309e915a895711ebd34 (diff)
downloadmullvadvpn-552c720753fc9dd0560db621c5aec23b39be10eb.tar.xz
mullvadvpn-552c720753fc9dd0560db621c5aec23b39be10eb.zip
Merge branch 'fix-rest-req-timeouts'
-rw-r--r--mullvad-rpc/src/rest.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mullvad-rpc/src/rest.rs b/mullvad-rpc/src/rest.rs
index 7eb17c67b6..17362cce05 100644
--- a/mullvad-rpc/src/rest.rs
+++ b/mullvad-rpc/src/rest.rs
@@ -415,12 +415,13 @@ impl RequestFactory {
HeaderValue::from_static("application/json"),
);
- Ok(RestRequest::from(request))
+ Ok(self.set_request_timeout(RestRequest::from(request)))
}
pub fn delete(&self, path: &str) -> Result<RestRequest> {
self.hyper_request(path, Method::DELETE)
.map(RestRequest::from)
+ .map(|req| self.set_request_timeout(req))
}
fn hyper_request(&self, path: &str, method: Method) -> Result<Request> {