deblan-mirror/reaction
1
0
Fork 0
mirror of https://framagit.org/ppom/reaction synced 2026-03-14 12:45:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

simplify handle_child

Browse source
This commit is contained in:
Baptiste Careil 2024-12-06 11:16:03 +01:00
commit a379df8998
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/daemon/stream.rs
View file

@ -75,21 +75,13 @@ async fn handle_child(
const STREAM_PROCESS_GRACE_TIME_SEC: u64 = 15;
const STREAM_PROCESS_KILL_WAIT_TIMEOUT_SEC: u64 = 5;
enum State {
Kill,
Exited,
}
// wait either for the child process to exit on its own or for the shutdown signal
match futures::select! {
_ = child.wait().fuse() => State::Exited,
_ = shutdown_rx.recv().fuse() => State::Kill,
} {
State::Exited => {
futures::select! {
_ = child.wait().fuse() => {
error!("stream {stream_name} exited: its command returned.");
return;
}
State::Kill => {}
_ = shutdown_rx.recv().fuse() => {}
}
// first, try to ask nicely the child process to exit
@ -100,12 +92,11 @@ async fn handle_child(
// but we still need to reclaim it with Child::wait
let _ = nix::sys::signal::kill(pid, nix::sys::signal::SIGTERM);
match futures::select! {
_ = child.wait().fuse() => State::Exited,
_ = sleep(Duration::from_secs(STREAM_PROCESS_GRACE_TIME_SEC)).fuse() => State::Kill,
} {
State::Exited => return,
State::Kill => {}
futures::select! {
_ = child.wait().fuse() => {
return;
},
_ = sleep(Duration::from_secs(STREAM_PROCESS_GRACE_TIME_SEC)).fuse() => {},
}
} else {
warn!("could not get PID of child process for stream {stream_name}");
@ -113,7 +104,7 @@ async fn handle_child(
}
// if that fails, or we cannot get the underlying PID, terminate the process.
// NOTE: a process killed with SIGKILL are not guaranteed to exit. It can be locked up in a
// NOTE: processes killed with SIGKILL are not guaranteed to exit. They can be locked up in a
// syscall to a resource no-longer available (a notorious example is a read on a disconnected
// NFS share)