deps and fix exit message

junkurihara · Dec 26, 2023 · 4e59044 · 4e59044
1 parent 51ad317
commit 4e59044
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/proxy-bin/Cargo.toml b/proxy-bin/Cargo.toml
@@ -34,18 +34,18 @@ publish = false
 [dependencies]
 doh-auth-proxy-lib = { path = "../proxy-lib/" }
 
-anyhow = "1.0.75"
+anyhow = "1.0.76"
 mimalloc = { version = "*", default-features = false }
 serde = { version = "1.0.193", default-features = false, features = ["derive"] }
 derive_builder = "0.12.0"
-tokio = { version = "1.35.0", default-features = false, features = [
+tokio = { version = "1.35.1", default-features = false, features = [
   "net",
   "rt-multi-thread",
   "time",
   "sync",
   "macros",
 ] }
-async-trait = "0.1.74"
+async-trait = "0.1.75"
 
 # config
 clap = { version = "4.4.11", features = ["std", "cargo", "wrap_help"] }

diff --git a/proxy-bin/src/main.rs b/proxy-bin/src/main.rs
@@ -105,8 +105,8 @@ async fn proxy_service_with_watcher(
   // Continuous monitoring
   loop {
     tokio::select! {
-      _ = entrypoint(&proxy_conf, &runtime_handle, Some(term_notify.clone())) => {
-        error!("proxy entrypoint exited");
+      res = entrypoint(&proxy_conf, &runtime_handle, Some(term_notify.clone())) => {
+        error!("proxy entrypoint exited: {:?}", if res.is_err() { res.unwrap_err().to_string() } else { "".to_string() });
         break;
       }
       _ = config_rx.changed() => {

diff --git a/proxy-lib/Cargo.toml b/proxy-lib/Cargo.toml
@@ -33,21 +33,21 @@ publish = false
 
 [dependencies]
 rand = "0.8.5"
-tokio = { version = "1.35.0", features = [
+tokio = { version = "1.35.1", features = [
   "net",
   "rt-multi-thread",
   "time",
   "sync",
   "macros",
 ] }
-futures = { version = "0.3.29", default-features = false, features = [
+futures = { version = "0.3.30", default-features = false, features = [
   "std",
   "async-await",
 ] }
-anyhow = "1.0.75"
+anyhow = "1.0.76"
 tracing = "0.1.40"
-thiserror = "1.0.51"
-async-trait = "0.1.74"
+thiserror = "1.0.52"
+async-trait = "0.1.75"
 serde = { version = "1.0.193", features = ["derive"] }
 itertools = "0.12.0"
 rustc-hash = "1.1.0"
@@ -65,7 +65,8 @@ regex = "1.10.2"
 socket2 = "0.5.5"
 
 # http client
-reqwest = { version = "0.11.22", default-features = false, features = [
+# TODO: change this to hyper-1.0
+reqwest = { version = "0.11.23", default-features = false, features = [
   "json",
   "trust-dns",
   "rustls-tls",