diff --git a/src/main.rs b/src/main.rs index e029734..6b1d74a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -298,7 +298,7 @@ async fn file_handler(name: &str, files: &Vec, tx: mpsc::Sender) { }, "hold" => { tx.send(2).await.unwrap(); - break; + return; }, _ => { tx.send(101).await.unwrap(); @@ -328,8 +328,7 @@ fn check_file(filename: &str, path: &str) -> Result<(), CustomError> { async fn service_handler(name: &str, services: &Vec, tx: mpsc::Sender) { // println!("service daemon on {}", name); if is_active(name) { - let mut er = 0; - 'for_loop: for serv in services { + for serv in services { match check_service(&serv.hostname, &serv.port) { Ok(_) => { continue; @@ -338,29 +337,25 @@ async fn service_handler(name: &str, services: &Vec, tx: mpsc::Sender< println!("Service {}:{} is unreachable for process {}", &serv.hostname, &serv.port, &name); match serv.triggers.on_lost.as_str() { "stay" => { - continue; + println!("1"); }, "stop" => { + println!("2"); match looped_service_connecting(&name, serv).await { - Ok(_) => { - continue 'for_loop; - }, + Ok(_) => {}, Err(_) => { tx.send(5).await.unwrap(); - er += 1; return; }, } }, "hold" => { + println!("3"); match looped_service_connecting(&name, serv).await { - Ok(_) => { - continue 'for_loop; - }, + Ok(_) => {}, Err(_) => { tx.send(6).await.unwrap(); - er += 1; - break 'for_loop; + return; }, } }, @@ -372,7 +367,7 @@ async fn service_handler(name: &str, services: &Vec, tx: mpsc::Sender< }, } } - if is_frozen(name) && er == 0 { + if is_frozen(name) { tx.send(11).await.unwrap(); } }