Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usage of graceful_shutdown #4

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Remove usage of graceful_shutdown #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99dce31
Remove usage of graceful_shutdown
psibi Sep 26, 2023
3133fb8
cargo fmt
psibi Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn relaunch_if_pid1(option: Pid1Settings) -> Result<(), Error> {
if option.log {
eprintln!("pid1-rs: Process running as PID 1");
}
pid1_handling(Some(child))
pid1_handling(&option, Some(child))
} else {
if option.log {
eprintln!("pid1-rs: Process not running as Pid 1: PID {pid}");
Expand All @@ -45,7 +45,7 @@ fn relaunch() -> Result<Child, Error> {
.map_err(Error::SpawnChild)
}

fn pid1_handling(child: Option<Child>) -> ! {
fn pid1_handling(settings: &Pid1Settings, child: Option<Child>) -> ! {
let mut signals = Signals::new([SIGTERM, SIGINT, SIGCHLD]).unwrap();
let child = child.map(|x| x.id());
struct ProcessStatus {
Expand All @@ -68,25 +68,32 @@ fn pid1_handling(child: Option<Child>) -> ! {
let result = kill(pid, Some(nix_signal));
match result {
Ok(()) => std::process::exit(exit_code),
Err(_) => graceful_shutdown(),
Err(errno) => {
if settings.log {
eprintln!(
"pid1-rs: kill() failed on {pid} with errno: {errno}"
);
}
std::process::exit(exit_code)
}
}
}
None => std::process::exit(exit_code),
}
}
if signal == SIGCHLD {
let child_exit_status = match nix::sys::wait::wait().unwrap() {
let child_process_status = match nix::sys::wait::wait().unwrap() {
WaitStatus::Exited(pid, exit_code) => {
let exit_status = ProcessStatus { pid, exit_code };
Some(exit_status)
let process_status = ProcessStatus { pid, exit_code };
Some(process_status)
}
WaitStatus::Signaled(pid, signal, _) => {
let exit_status = ProcessStatus {
let process_status = ProcessStatus {
pid,
// Translate signal to exit code
exit_code: signal as i32 + 128,
};
Some(exit_status)
Some(process_status)
}
WaitStatus::Stopped(_, _) => None,
WaitStatus::PtraceEvent(_, _, _) => None,
Expand All @@ -96,7 +103,7 @@ fn pid1_handling(child: Option<Child>) -> ! {
};
(|| {
let child = child?;
let child_exit_status = child_exit_status?;
let child_exit_status = child_process_status?;
let child_pid = child_exit_status.pid;
let child_pid = u32::try_from(child_pid.as_raw()).ok()?;
if child_pid == child {
Expand All @@ -109,8 +116,3 @@ fn pid1_handling(child: Option<Child>) -> ! {
}
}
}

fn graceful_shutdown() -> ! {
// FIXME the name is a lie
std::process::abort();
}
Loading