LibreCloud/ZTerton
1
1
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

chore: fix request config for liveness - get_cloud_check

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-09-23 12:42:51 +01:00
parent 1bc7dccb37
commit 28404160ed
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/handlers.rs
View File

@ -1,3 +1,4 @@
pub mod h_config; pub mod h_config;
pub mod h_data; pub mod h_data;
pub mod h_defs; pub mod h_defs;
pub mod datastores;

7
src/handlers/h_config.rs
View File

@ -15,10 +15,10 @@ use kloud::{
}; };
use clds::clouds::defs::{Cloud}; use clds::clouds::defs::{Cloud};
use crate::defs::{DataDBs}; // ,CollsData}; 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 { 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() { if opts.grp.is_empty() {
result = on_cloud_req(&reqname,&cloud,&reqenv,&opts.tsksrvcs,&opts.srvrs,&opts.cld).await; result = on_cloud_req(&reqname,&cloud,&reqenv,&opts.tsksrvcs,&opts.srvrs,&opts.cld).await;
} else if opts.name.is_empty() { } 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); let source = format!("{}/{}/{}",&opts.cld,&opts.grp,&opts.name);
result = on_cloud_name_req(&reqname,&cloud,&reqenv,&opts.tsksrvcs,&opts.srvrs,&source).await; 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 { match reqname {
"config" => { "config" => {
result.to_owned() result.to_owned()