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

chore: add cache_items & get_cloud_check

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-09-23 12:32:15 +01:00
parent d97cc972c2
commit ea591729d7
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/clouds/on_clouds.rs
View File

@ -621,14 +621,14 @@ pub async fn on_cloud_req(reqname: &str,env_cloud: &Cloud,reqenv: &ReqEnv,req_ts
create_cloud_config(reqname,req_tsksrvcs,reqenv,entries,cloud).await create_cloud_config(reqname,req_tsksrvcs,reqenv,entries,cloud).await
} }
} }
pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str, tsksrvcs: &str) -> Result<()> { pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str) -> Result<()> {
let debug = envmnt::get_isize("DEBUG",0); let debug = envmnt::get_isize("DEBUG",0);
if debug > 0 { if debug > 0 {
println!("cloud cache {} ... {:?} ",reqname,chrono::Utc::now()); println!("cloud cache {} ... {:?} ",reqname,chrono::Utc::now());
} }
let config = reqenv.config(); let config = reqenv.config();
let lock_path = format!("{}/{}_{}.{}",&config.cache_lock_path,&reqname,&tsksrvcs.replace(",","_"),&config.cache_lock_ext); let lock_path = format!("{}/{}_{}.{}",&config.cache_lock_path,&reqname,&config.cache_items.replace(",","_"),&config.cache_lock_ext);
let output_path = format!("{}/{}_{}.json",&config.cache_path,&reqname,&tsksrvcs.replace(",","_")); let output_path = format!("{}/{}_{}.json",&config.cache_path,&reqname,&config.cache_items.replace(",","_"));
if Path::new(&lock_path).exists() { if Path::new(&lock_path).exists() {
if envmnt::get_or(format!("LAST_CACHE_{}",&output_path),"") != "" { if envmnt::get_or(format!("LAST_CACHE_{}",&output_path),"") != "" {
if debug > 0 { if debug > 0 {
@ -643,7 +643,7 @@ pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, r
// println!("Lock NOT found {} ",&lock_path); // println!("Lock NOT found {} ",&lock_path);
let now = chrono::Utc::now().timestamp(); let now = chrono::Utc::now().timestamp();
envmnt::set(format!("LAST_CACHE_{}",&output_path), format!("{}",&now)); envmnt::set(format!("LAST_CACHE_{}",&output_path), format!("{}",&now));
let result = on_cloud_req(&reqname_job,&cloud,&reqenv,tsksrvcs,"","*").await; let result = on_cloud_req(&reqname_job,&cloud,&reqenv,&config.cache_items,"","*").await;
if Path::new(&output_path).exists() { if Path::new(&output_path).exists() {
fs::remove_file(&output_path)?; fs::remove_file(&output_path)?;
} }
@ -658,7 +658,7 @@ pub async fn make_cloud_cache(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
if envmnt::get_isize("DEBUG",0) > 0 { if envmnt::get_isize("DEBUG",0) > 0 {
println!("Making cloud cache {:?} ... ",chrono::Utc::now()); println!("Making cloud cache {:?} ... ",chrono::Utc::now());
} }
get_cloud_cache_req(reqenv,cloud, "config", "config_job", "monitor,resources,liveness,provision").await.unwrap_or_else(|e| println!("Error cache config: {}",e)); get_cloud_cache_req(reqenv, cloud, "config", "config_job").await.unwrap_or_else(|e| println!("Error cache config: {}",e));
Ok(()) Ok(())
} }
pub async fn run_clouds_check(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> { pub async fn run_clouds_check(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
@ -681,4 +681,29 @@ pub async fn run_clouds_check(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
println!("{}: [cloud check] -> {}\n",&now,&output_path); println!("{}: [cloud check] -> {}\n",&now,&output_path);
} }
Ok(()) Ok(())
}
// pub async fn get_cloud_check(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str) -> Result<()> {
pub async fn get_cloud_check(reqenv: &ReqEnv) -> String {
let debug = envmnt::get_isize("DEBUG",0);
if debug > 0 {
println!("cloud check ... {:?} ",chrono::Utc::now());
}
let config = reqenv.config();
let output_path = format!("{}/clouds.json",&config.check_path);
let output_data = fs::read_to_string(&output_path).with_context(|| format!("Failed to read json check 'outut_path' from {}", &output_path))
.unwrap_or_else(|e| {
eprintln!("read file {}: {}",&output_path,e);
String::from("")
});
output_data
// let result = on_cloud_req(&reqname_job,&cloud,&reqenv,&config.cache_items,"","*").await;
// if Path::new(&output_path).exists() {
// fs::remove_file(&output_path)?;
// }
// let mut file = OpenOptions::new().write(true).create(true).open(&output_path)?;
// file.write_all(result.as_bytes())?;
// if debug > 0 {
// println!("{}: [cloud check] -> {}\n",&now,&output_path);
// }
// Ok(())
} }