From a896583da60535ec7d071702da426c70ef618062 Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Sat, 27 Sep 2025 00:21:58 -0700 Subject: [PATCH] deploy 2.0.0-dev-12 --- Cargo.lock | 68 +++++++++++++++++++++++++++++++++-- Cargo.toml | 2 +- bin/core/src/helpers/query.rs | 11 +++--- 3 files changed, 71 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3c560719..6343435c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -953,6 +953,7 @@ name = "cache" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -990,6 +991,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "tokio", @@ -1193,6 +1197,7 @@ name = "command" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -1230,6 +1235,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "komodo_client", "run_command", @@ -1267,6 +1275,7 @@ name = "config" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -1304,6 +1313,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "colored", "indexmap 2.11.4", @@ -1600,6 +1612,7 @@ name = "database" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -1637,6 +1650,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "async-compression", @@ -1956,6 +1972,7 @@ name = "environment" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -1993,6 +2010,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "formatting", @@ -2014,6 +2034,7 @@ name = "environment_file" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -2051,6 +2072,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "thiserror 2.0.16", ] @@ -2158,6 +2182,7 @@ name = "formatting" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -2195,6 +2220,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "serror", ] @@ -2378,6 +2406,7 @@ name = "git" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -2415,6 +2444,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "cache", @@ -3026,6 +3058,7 @@ name = "interpolate" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3063,6 +3096,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "komodo_client", @@ -3205,6 +3241,7 @@ name = "komodo_cli" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3242,6 +3279,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "chrono", @@ -3279,6 +3319,7 @@ name = "komodo_client" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3316,6 +3357,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "async_timing_util", @@ -3363,6 +3407,7 @@ name = "komodo_core" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3400,6 +3445,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "arc-swap", @@ -3485,6 +3533,7 @@ name = "komodo_periphery" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3522,6 +3571,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "arc-swap", @@ -3657,6 +3709,7 @@ name = "logger" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -3694,6 +3747,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "komodo_client", @@ -3965,7 +4021,7 @@ dependencies = [ [[package]] name = "noise" -version = "2.0.0-dev-11" +version = "2.0.0-dev-12" dependencies = [ "anyhow", "base64 0.22.1", @@ -4475,6 +4531,7 @@ name = "periphery_client" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -4512,6 +4569,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "komodo_client", "resolver_api", @@ -5070,6 +5130,7 @@ name = "response" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.19.5" ======= version = "2.0.0-dev-0" @@ -5107,6 +5168,9 @@ version = "2.0.0-dev-10" ======= version = "2.0.0-dev-11" >>>>>>> 898c76bb (deploy 2.0.0-dev-11) +======= +version = "2.0.0-dev-12" +>>>>>>> 8615bbf8 (deploy 2.0.0-dev-12) dependencies = [ "anyhow", "axum", @@ -6454,7 +6518,7 @@ dependencies = [ [[package]] name = "transport" -version = "2.0.0-dev-11" +version = "2.0.0-dev-12" dependencies = [ "anyhow", "axum", diff --git a/Cargo.toml b/Cargo.toml index afbf4247f..7febec59a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ ] [workspace.package] -version = "2.0.0-dev-11" +version = "2.0.0-dev-12" edition = "2024" authors = ["mbecker20 "] license = "GPL-3.0-or-later" diff --git a/bin/core/src/helpers/query.rs b/bin/core/src/helpers/query.rs index 5940dad46..2ae46e32b 100644 --- a/bin/core/src/helpers/query.rs +++ b/bin/core/src/helpers/query.rs @@ -74,13 +74,10 @@ pub async fn get_server_state(server: &Server) -> ServerState { if !server.config.enabled { return ServerState::Disabled; } - // Unwrap ok: Server disabled check above - match super::periphery_client(server) - .await - .unwrap() - .request(periphery_client::api::GetHealth {}) - .await - { + let Ok(periphery) = super::periphery_client(server).await else { + return ServerState::NotOk; + }; + match periphery.request(periphery_client::api::GetHealth {}).await { Ok(_) => ServerState::Ok, Err(_) => ServerState::NotOk, }