From d6806062718a333df03c7d0f94a8fae7f8da4f64 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Fri, 27 Dec 2024 13:15:35 -0800 Subject: [PATCH] compilation passes Signed-off-by: Brian L. Troutwine --- Cargo.lock | 30 +----------------------------- lading/Cargo.toml | 2 +- lading/src/blackhole/http.rs | 2 +- lading/src/blackhole/splunk_hec.rs | 2 +- lading/src/blackhole/sqs.rs | 2 +- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0370ee407..fad002c65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1651,7 +1651,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tonic 0.9.2", + "tonic 0.12.3", "tower 0.5.2", "tracing", "tracing-subscriber", @@ -3220,34 +3220,6 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum 0.6.20", - "base64 0.21.7", - "bytes", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.12.3" diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 5648d5412..e0e2b1c8a 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -78,7 +78,7 @@ tokio = { workspace = true, features = [ ] } tokio-stream = { version = "0.1", features = ["io-util"] } tokio-util = { version = "0.7", features = ["io"] } -tonic = { version = "0.9" } +tonic = { version = "0.12" } tower = { workspace = true, features = [ "timeout", "limit", diff --git a/lading/src/blackhole/http.rs b/lading/src/blackhole/http.rs index f943f0dda..e53675e16 100644 --- a/lading/src/blackhole/http.rs +++ b/lading/src/blackhole/http.rs @@ -248,7 +248,7 @@ impl Http { pin!(shutdown); loop { tokio::select! { - _ = &mut shutdown => { + () = &mut shutdown => { info!("shutdown signal received"); break; } diff --git a/lading/src/blackhole/splunk_hec.rs b/lading/src/blackhole/splunk_hec.rs index 65457b74a..fb852f30d 100644 --- a/lading/src/blackhole/splunk_hec.rs +++ b/lading/src/blackhole/splunk_hec.rs @@ -201,7 +201,7 @@ impl SplunkHec { pin!(shutdown); loop { tokio::select! { - _ = &mut shutdown => { + () = &mut shutdown => { info!("shutdown signal received"); break; } diff --git a/lading/src/blackhole/sqs.rs b/lading/src/blackhole/sqs.rs index baa013a2a..e3c5aaca4 100644 --- a/lading/src/blackhole/sqs.rs +++ b/lading/src/blackhole/sqs.rs @@ -108,7 +108,7 @@ impl Sqs { pin!(shutdown); loop { tokio::select! { - _ = &mut shutdown => { + () = &mut shutdown => { info!("shutdown signal received"); break; }