From 28404160ed95c64e71730a363cc3f4d33a744463 Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Thu, 23 Sep 2021 12:42:51 +0100 Subject: [PATCH] chore: fix request config for liveness - get_cloud_check --- src/handlers.rs | 3 ++- src/handlers/h_config.rs | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/handlers.rs b/src/handlers.rs index 2601400..ccce2d7 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -1,3 +1,4 @@ pub mod h_config; pub mod h_data; -pub mod h_defs; \ No newline at end of file +pub mod h_defs; +pub mod datastores; \ No newline at end of file diff --git a/src/handlers/h_config.rs b/src/handlers/h_config.rs index 1d423ea..e32f45a 100644 --- a/src/handlers/h_config.rs +++ b/src/handlers/h_config.rs @@ -15,10 +15,10 @@ use kloud::{ }; use clds::clouds::defs::{Cloud}; use crate::defs::{DataDBs}; // ,CollsData}; -use clds::clouds::on_clouds::{on_cloud_req,on_cloud_name_req}; +use clds::clouds::on_clouds::{on_cloud_req,on_cloud_name_req,get_cloud_check}; pub async fn cloud_req(reqname: &str,cloud: &Cloud,reqenv: &ReqEnv,opts: &KloudQueryConfigFilters) -> String { - let result: String; + let mut result: String; if opts.grp.is_empty() { result = on_cloud_req(&reqname,&cloud,&reqenv,&opts.tsksrvcs,&opts.srvrs,&opts.cld).await; } else if opts.name.is_empty() { @@ -28,6 +28,9 @@ pub async fn cloud_req(reqname: &str,cloud: &Cloud,reqenv: &ReqEnv,opts: &KloudQ let source = format!("{}/{}/{}",&opts.cld,&opts.grp,&opts.name); result = on_cloud_name_req(&reqname,&cloud,&reqenv,&opts.tsksrvcs,&opts.srvrs,&source).await; } + if opts.tsksrvcs.contains("liveness") { + result = format!("{}:{}{}:{}{}",r#"{"req""#,&result,r#","liveness""#,get_cloud_check(&reqenv).await,r#"}"#); + } match reqname { "config" => { result.to_owned()