refactor: don't share reqwest::HttpClient across tokio runtimes
#24092
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dsherret
commented
Jun 3, 2024
| @@ -641,140 +634,17 @@ impl FileFetcher { | |||
| } | |||
| } | |||
|
|
|||
| #[derive(Debug, Eq, PartialEq)] | |||
| enum FetchOnceResult { | |||
There was a problem hiding this comment.
Moved to HttpClient so that more of the reqwest api usage is buried in there.
| } | ||
| } | ||
|
|
||
| #[allow(clippy::print_stdout)] |
There was a problem hiding this comment.
The below is mostly copy/paste from file_fetcher.rs
| @@ -407,14 +518,67 @@ pub async fn get_response_body_with_progress( | |||
| Ok(bytes.into()) | |||
| } | |||
|
|
|||
| /// Construct the next uri based on base uri and location header fragment | |||
There was a problem hiding this comment.
Copy+pste from file_fetcher.rs
| // If there's an absolute url with no path, eg. https://my-cli.com | ||
| // perform a request, and see if it redirects another file instead. | ||
| let mut url = url.clone(); | ||
|
|
||
| if url.path() == "/" { | ||
| let client = HttpClient::new(None, None); |
There was a problem hiding this comment.
Bug. This was not taking into account the user's configuration.
| @@ -672,9 +682,8 @@ async fn testify( | |||
| }, | |||
| }; | |||
|
|
|||
| let client = Client::new(); | |||
| bail!("No OIDC token available"); | ||
| }; | ||
|
|
||
| let client = Client::new(); |
dsherret
changed the title
rewest::HttpClient across tokio runtimesreqwest::HttpClient across tokio runtimes
bartlomieju
approved these changes
Jun 3, 2024
cli/clippy.toml
Outdated
|
I'm a bit wary about all these clones, but let's see if we see any regression in the benchmarks. |
Should be fine. It's only cloning Arcs and mostly only when making http requests ( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also fixes several issues where we weren't properly creating http clients with the user's settings.