diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2021-02-03 11:40:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 11:40:43 +0100 |
| commit | fb358380c0570103619b0ce71c7fcb1b5a17986c (patch) | |
| tree | 353e1edc93240b57c29440f370372a67a4ff9cb6 | |
| parent | 3f6483e5015c4cc3d1569b85ea198bdc1cb41082 (diff) | |
fix: improve http client builder error message (#9380)
Include the lower-level error message in the generic error message.
No test because I can't actually make it fail by passing it bad PEM.
I checked and `reqwest::Certificate::from_pem()` always returns `Ok()`.
Fixes #9364.
| -rw-r--r-- | cli/http_util.rs | 3 | ||||
| -rw-r--r-- | op_crates/fetch/lib.rs | 3 | ||||
| -rw-r--r-- | runtime/http_util.rs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cli/http_util.rs b/cli/http_util.rs index 5b6274309..437b9355c 100644 --- a/cli/http_util.rs +++ b/cli/http_util.rs @@ -34,8 +34,9 @@ pub fn create_http_client( builder .build() - .map_err(|_| generic_error("Unable to build http client")) + .map_err(|e| generic_error(format!("Unable to build http client: {}", e))) } + /// Construct the next uri based on base uri and location header fragment /// See <https://tools.ietf.org/html/rfc3986#section-4.2> fn resolve_url_from_location(base_url: &Url, location: &str) -> Url { diff --git a/op_crates/fetch/lib.rs b/op_crates/fetch/lib.rs index 46c72e7a8..23f356a96 100644 --- a/op_crates/fetch/lib.rs +++ b/op_crates/fetch/lib.rs @@ -3,6 +3,7 @@ #![deny(warnings)] use deno_core::error::bad_resource_id; +use deno_core::error::generic_error; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::futures::Future; @@ -433,5 +434,5 @@ fn create_http_client( } builder .build() - .map_err(|_| deno_core::error::generic_error("Unable to build http client")) + .map_err(|e| generic_error(format!("Unable to build http client: {}", e))) } diff --git a/runtime/http_util.rs b/runtime/http_util.rs index 97d6125e0..72d41d6e3 100644 --- a/runtime/http_util.rs +++ b/runtime/http_util.rs @@ -28,7 +28,7 @@ pub fn create_http_client( builder .build() - .map_err(|_| generic_error("Unable to build http client")) + .map_err(|e| generic_error(format!("Unable to build http client: {}", e))) } #[cfg(test)] |