chore: refactor

junkurihara · Nov 16, 2023 · 735c750 · 735c750
1 parent 7f96e66
commit 735c750
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/legacy/Cargo.toml b/legacy/Cargo.toml
@@ -75,7 +75,7 @@ mimalloc = { version = "*", default-features = false }
 
 # logging
 tracing = { version = "0.1.40" }
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 
 [dev-dependencies]
 trust-dns-client = "0.23.2"

diff --git a/proxy-bin/Cargo.toml b/proxy-bin/Cargo.toml
@@ -54,6 +54,6 @@ hot_reload = "0.1.4"
 
 # logging
 tracing = { version = "0.1.40" }
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 url = "2.4.1"
 dotenv = "0.15.0"
diff --git a/proxy-lib/src/http_client/http_client_main.rs b/proxy-lib/src/http_client/http_client_main.rs
@@ -1,6 +1,7 @@
 use crate::{
   error::*,
   trait_resolve_ips::{resolve_ips, ResolveIpResponse, ResolveIps},
+  ProxyConfig,
 };
 use reqwest::{header::HeaderMap, Client, IntoUrl, RequestBuilder, Url};
 use std::sync::Arc;
@@ -32,13 +33,14 @@ pub struct HttpClient {
 impl HttpClient {
   /// Build HttpClient
   pub async fn new(
+    proxy_config: &ProxyConfig,
     endpoints: &[Url],
-    timeout_sec: Duration,
-    user_agent: &str,
     default_headers: Option<&HeaderMap>,
     resolver_ips: impl ResolveIps,
-    endpoint_resolution_period_sec: Duration,
   ) -> Result<Self> {
+    let timeout_sec = proxy_config.http_timeout_sec;
+    let user_agent = &proxy_config.http_user_agent;
+    let endpoint_resolution_period_sec = proxy_config.endpoint_resolution_period_sec;
     let resolved_ips = resolve_ips(endpoints, resolver_ips).await?;
     Ok(Self {
       inner: Arc::new(RwLock::new(

diff --git a/proxy-lib/src/lib.rs b/proxy-lib/src/lib.rs
@@ -53,15 +53,7 @@ pub async fn entrypoint(
   if let Some(auth) = &proxy_config.authentication_config {
     endpoint_candidates.push(auth.token_api.clone());
   }
-  let http_client = HttpClient::new(
-    &endpoint_candidates,
-    proxy_config.http_timeout_sec,
-    &proxy_config.http_user_agent,
-    None,
-    bootstrap_dns_resolver.clone(),
-    proxy_config.endpoint_resolution_period_sec,
-  )
-  .await?;
+  let http_client = HttpClient::new(proxy_config, &endpoint_candidates, None, bootstrap_dns_resolver.clone()).await?;
   let http_client = Arc::new(http_client);
 
   // spawn authentication service