mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-02 14:18:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: send sigkill to runner process if still running 2 seconds after sigterm

Browse source
This commit is contained in:
Gabriele Musco 2023-08-31 06:00:05 +00:00
commit 30c4994f6b
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cmd_runner.rs
View file

@ -1,5 +1,5 @@
use nix::{ use nix::{
sys::signal::{kill, Signal::SIGTERM}, sys::signal::{kill, Signal::{SIGTERM, SIGKILL}},
unistd::Pid, unistd::Pid,
}; };
@ -16,7 +16,7 @@ use std::{
mpsc::{sync_channel, Receiver, SyncSender}, mpsc::{sync_channel, Receiver, SyncSender},
Arc, Mutex, Arc, Mutex,
}, },
thread::{self, JoinHandle}, thread::{self, JoinHandle, sleep}, time::Duration,
}; };
pub struct CmdRunner { pub struct CmdRunner {
@ -140,6 +140,12 @@ impl CmdRunner {
let mut proc = process.unwrap(); let mut proc = process.unwrap();
let child_pid = Pid::from_raw(proc.id().try_into().expect("Could not convert pid to u32")); let child_pid = Pid::from_raw(proc.id().try_into().expect("Could not convert pid to u32"));
kill(child_pid, SIGTERM).expect("Could not send sigterm to process"); kill(child_pid, SIGTERM).expect("Could not send sigterm to process");
thread::spawn(move || {
sleep(Duration::from_secs(2));
if kill(child_pid, None).is_ok() { // process is still alive
kill(child_pid, SIGKILL).expect("Failed to kill process");
}
});
self.join_threads(); self.join_threads();
proc.wait().expect("Failed to wait for process"); proc.wait().expect("Failed to wait for process");
} }