all fixed but...
parent
759ff64532
commit
73daa8320b
|
|
@ -59,7 +59,7 @@
|
||||||
"triggers" : {
|
"triggers" : {
|
||||||
"wait" : 10,
|
"wait" : 10,
|
||||||
"delay" : 2,
|
"delay" : 2,
|
||||||
"onLost" : "stop"
|
"onLost" : "hold"
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
106
src/main.rs
106
src/main.rs
|
|
@ -121,13 +121,18 @@ async fn run_daemons(
|
||||||
match _val.unwrap() {
|
match _val.unwrap() {
|
||||||
// 1 - File-dependency handling error -> terminating (after waiting)
|
// 1 - File-dependency handling error -> terminating (after waiting)
|
||||||
1 => {
|
1 => {
|
||||||
println!("Dependency handling error: Terminating {} process ..." , &proc.name);
|
if is_active(&proc.name) {
|
||||||
terminate_process(&proc.name).await;
|
println!("Dependency handling error: Terminating {} process ..." , &proc.name);
|
||||||
break;
|
terminate_process(&proc.name).await;
|
||||||
|
}
|
||||||
|
// break;
|
||||||
},
|
},
|
||||||
// 2 - File-dependency handling error -> holding (after waiting)
|
// 2 - File-dependency handling error -> holding (after waiting)
|
||||||
2 => {
|
2 => {
|
||||||
println!("Error due to starting {} process", &proc.name);
|
if !is_frozen(&proc.name) {
|
||||||
|
println!("Dependency handling error: Freezing {} process ..." , &proc.name);
|
||||||
|
freeze_process(&proc.name).await;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// 3 - Running process error
|
// 3 - Running process error
|
||||||
3 => {
|
3 => {
|
||||||
|
|
@ -139,14 +144,18 @@ async fn run_daemons(
|
||||||
},
|
},
|
||||||
// 5 - Timeout of waiting service-dependency -> terminating (after waiting)
|
// 5 - Timeout of waiting service-dependency -> terminating (after waiting)
|
||||||
5 => {
|
5 => {
|
||||||
println!("Timeout of waiting service-dependency: Terminating {} process ..." , &proc.name);
|
if is_active(&proc.name) {
|
||||||
terminate_process(&proc.name).await;
|
println!("Timeout of waiting service-dependency: Terminating {} process ..." , &proc.name);
|
||||||
break;
|
terminate_process(&proc.name).await;
|
||||||
|
}
|
||||||
|
// break;
|
||||||
},
|
},
|
||||||
// 6 - Timeout of waiting service-dependency -> holding (after waiting)
|
// 6 - Timeout of waiting service-dependency -> holding (after waiting)
|
||||||
6 => {
|
6 => {
|
||||||
println!("Timeout of waiting service-dependency: Freezing {} process ..." , &proc.name);
|
if !is_frozen(&proc.name) {
|
||||||
freeze_process(&proc.name).await;
|
println!("Timeout of waiting service-dependency: Freezing {} process ..." , &proc.name);
|
||||||
|
freeze_process(&proc.name).await;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// // 7 - File-dependency change -> terminating (after check)
|
// // 7 - File-dependency change -> terminating (after check)
|
||||||
// 7 => {},
|
// 7 => {},
|
||||||
|
|
@ -157,13 +166,17 @@ async fn run_daemons(
|
||||||
|
|
||||||
// 10 - Process unfreaze call via file handler
|
// 10 - Process unfreaze call via file handler
|
||||||
10 => {
|
10 => {
|
||||||
println!("Unfreezing process {} call via file handler...", &proc.name);
|
if is_frozen(&proc.name) {
|
||||||
unfreeze_process(&proc.name).await;
|
println!("Unfreezing process {} call...", &proc.name);
|
||||||
|
unfreeze_process(&proc.name).await;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// 11 - Process unfreaze call via service handler
|
// 11 - Process unfreaze call via service handler
|
||||||
11 => {
|
11 => {
|
||||||
println!("Unfreezing process {} call via service handler...", &proc.name);
|
if is_frozen(&proc.name) {
|
||||||
unfreeze_process(&proc.name).await;
|
println!("Unfreezing process {} call...", &proc.name);
|
||||||
|
unfreeze_process(&proc.name).await;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// 101 - Impermissible trigger values in JSON
|
// 101 - Impermissible trigger values in JSON
|
||||||
101 => {
|
101 => {
|
||||||
|
|
@ -248,8 +261,8 @@ async fn start_process(name: &str, path: &str) -> Result<(), CustomError> {
|
||||||
}
|
}
|
||||||
// check process status daemon
|
// check process status daemon
|
||||||
async fn running_handler(prc: &TrackingProcess, tx: mpsc::Sender<u8>){
|
async fn running_handler(prc: &TrackingProcess, tx: mpsc::Sender<u8>){
|
||||||
// println!("running daemon on {}", name);
|
// println!("running daemon on {}", prc.name);
|
||||||
loop {
|
// loop {
|
||||||
let _ = Command::new("pidof")
|
let _ = Command::new("pidof")
|
||||||
.arg(&prc.name)
|
.arg(&prc.name)
|
||||||
.output()
|
.output()
|
||||||
|
|
@ -258,30 +271,26 @@ async fn running_handler(prc: &TrackingProcess, tx: mpsc::Sender<u8>){
|
||||||
let files_check = file_handler(&prc.name, &prc.dependencies.files, tx.clone());
|
let files_check = file_handler(&prc.name, &prc.dependencies.files, tx.clone());
|
||||||
let services_check = service_handler(&prc.name, &prc.dependencies.services, tx.clone());
|
let services_check = service_handler(&prc.name, &prc.dependencies.services, tx.clone());
|
||||||
|
|
||||||
join!(files_check, services_check);
|
let res = join!(files_check, services_check);
|
||||||
|
|
||||||
// if inactive -> spawn checks -> active is true
|
// if inactive -> spawn checks -> active is true
|
||||||
|
if !is_active(&prc.name) && res.0.is_ok() && res.1.is_ok(){
|
||||||
if !is_active(&prc.name){
|
|
||||||
if start_process(&prc.name, &prc.path).await.is_err() {
|
if start_process(&prc.name, &prc.path).await.is_err() {
|
||||||
tx.send(3).await.unwrap();
|
tx.send(3).await.unwrap();
|
||||||
// return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if frozen -> spawn checks -> unfreeze is true
|
// if frozen -> spawn checks -> unfreeze is true
|
||||||
|
else if is_frozen(&prc.name) && res.0.is_ok() && res.1.is_ok(){
|
||||||
else if is_frozen(&prc.name){
|
tx.send(10).await.unwrap();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||||
tokio::task::yield_now().await;
|
tokio::task::yield_now().await;
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn file_handler(name: &str, files: &Vec<Files>, tx: mpsc::Sender<u8>) {
|
async fn file_handler(name: &str, files: &Vec<Files>, tx: mpsc::Sender<u8>) -> Result<(), CustomError>{
|
||||||
// println!("file daemon on {}", name);
|
// println!("file daemon on {}", name);
|
||||||
if is_active(name) && !is_frozen(name){
|
|
||||||
for file in files {
|
for file in files {
|
||||||
if check_file(&file.filename, &file.src).is_err() {
|
if check_file(&file.filename, &file.src).is_err() {
|
||||||
match file.triggers.on_delete.as_str() {
|
match file.triggers.on_delete.as_str() {
|
||||||
|
|
@ -289,31 +298,30 @@ async fn file_handler(name: &str, files: &Vec<Files>, tx: mpsc::Sender<u8>) {
|
||||||
continue;
|
continue;
|
||||||
},
|
},
|
||||||
"stop" => {
|
"stop" => {
|
||||||
tx.send(1).await.unwrap();
|
if is_active(name) {
|
||||||
return;
|
tx.send(1).await.unwrap();
|
||||||
|
}
|
||||||
|
tokio::time::sleep(Duration::from_millis(50)).await;
|
||||||
|
return Err(CustomError::Fatal);
|
||||||
},
|
},
|
||||||
"hold" => {
|
"hold" => {
|
||||||
tx.send(2).await.unwrap();
|
if is_active(name) {
|
||||||
// continue;
|
tokio::time::sleep(Duration::from_millis(50)).await;
|
||||||
// while check_file(&file.filename, &file.src).is_err() {
|
tx.send(2).await.unwrap();
|
||||||
// println!("zov");
|
return Err(CustomError::Fatal);
|
||||||
// tokio::time::sleep(Duration::from_millis(100)).await;
|
}
|
||||||
// }
|
|
||||||
// tx.send(10).await.unwrap();
|
|
||||||
},
|
},
|
||||||
_ => {
|
_ => {
|
||||||
|
tokio::time::sleep(Duration::from_millis(50)).await;
|
||||||
tx.send(101).await.unwrap();
|
tx.send(101).await.unwrap();
|
||||||
return;
|
return Err(CustomError::Fatal);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if is_frozen(name) {
|
|
||||||
// tx.send(10).await.unwrap();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||||
tokio::task::yield_now().await;
|
tokio::task::yield_now().await;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
fn check_file(filename: &str, path: &str) -> Result<(), CustomError> {
|
fn check_file(filename: &str, path: &str) -> Result<(), CustomError> {
|
||||||
let fileconcat = format!("{}{}", path, filename);
|
let fileconcat = format!("{}{}", path, filename);
|
||||||
|
|
@ -326,9 +334,8 @@ fn check_file(filename: &str, path: &str) -> Result<(), CustomError> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ??
|
// ??
|
||||||
async fn service_handler(name: &str, services: &Vec<Services>, tx: mpsc::Sender<u8>) {
|
async fn service_handler(name: &str, services: &Vec<Services>, tx: mpsc::Sender<u8>) -> Result<(), CustomError> {
|
||||||
// println!("service daemon on {}", name);
|
// println!("service daemon on {}", name);
|
||||||
if is_active(name) && !is_frozen(name) {
|
|
||||||
for serv in services {
|
for serv in services {
|
||||||
if check_service(&serv.hostname, &serv.port).await.is_err() {
|
if check_service(&serv.hostname, &serv.port).await.is_err() {
|
||||||
// println!("Service {}:{} is unreachable for process {}", &serv.hostname, &serv.port, &name);
|
// println!("Service {}:{} is unreachable for process {}", &serv.hostname, &serv.port, &name);
|
||||||
|
|
@ -338,27 +345,28 @@ async fn service_handler(name: &str, services: &Vec<Services>, tx: mpsc::Sender<
|
||||||
"stop" => {
|
"stop" => {
|
||||||
if looped_service_connecting(name, serv).await.is_err() {
|
if looped_service_connecting(name, serv).await.is_err() {
|
||||||
tx.send(5).await.unwrap();
|
tx.send(5).await.unwrap();
|
||||||
return;
|
return Err(CustomError::Fatal);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hold" => {
|
"hold" => {
|
||||||
|
if is_frozen(name) {
|
||||||
|
return Err(CustomError::Fatal);
|
||||||
|
}
|
||||||
if looped_service_connecting(name, serv).await.is_err() {
|
if looped_service_connecting(name, serv).await.is_err() {
|
||||||
tx.send(6).await.unwrap();
|
tx.send(6).await.unwrap();
|
||||||
|
return Err(CustomError::Fatal);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
_ => {
|
_ => {
|
||||||
tx.send(101).await.unwrap();
|
tx.send(101).await.unwrap();
|
||||||
return;
|
return Err(CustomError::Fatal);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if is_frozen(name) {
|
|
||||||
// tx.send(11).await.unwrap();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||||
tokio::task::yield_now().await;
|
tokio::task::yield_now().await;
|
||||||
|
Ok(())
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue