slime/lazymc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error handling and logging

Browse Source
This commit is contained in:
[object Object] 2022-12-28 14:37:08 -08:00
parent f7fe00aa50
commit 2c43446ed0
No known key found for this signature in database
GPG Key ID: F9ECDF22D7D28727
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/os/mod.rs
View File

@ -9,7 +9,7 @@ use nix::{sys::signal, unistd::Pid};
#[allow(unreachable_code)]
pub fn force_kill(pid: u32) -> bool {
#[cfg(unix)]
return signal::kill(Pid::from_raw(pid as i32), signal::SIGKILL) == Ok(());
return unix_signal(pid, signal::SIGKILL);
#[cfg(windows)]
unsafe {
@ -27,7 +27,7 @@ pub fn force_kill(pid: u32) -> bool {
#[allow(unreachable_code, dead_code, unused_variables)]
pub fn kill_gracefully(pid: u32) -> bool {
#[cfg(unix)]
return signal::kill(Pid::from_raw(pid as i32), signal::SIGTERM) == Ok(());
return unix_signal(pid, signal::SIGTERM);
unimplemented!(
"gracefully killing Minecraft server process not implemented on non-Unix platforms"
@ -42,7 +42,7 @@ pub fn kill_gracefully(pid: u32) -> bool {
#[allow(unreachable_code)]
pub fn freeze(pid: u32) -> bool {
#[cfg(unix)]
return signal::kill(Pid::from_raw(pid as i32), signal::SIGSTOP) == Ok(());
return unix_signal(pid, signal::SIGSTOP);
unimplemented!(
"Freezing the Minecraft server process is not implemented on non-Unix platforms."
@ -57,9 +57,20 @@ pub fn freeze(pid: u32) -> bool {
#[allow(unreachable_code)]
pub fn unfreeze(pid: u32) -> bool {
#[cfg(unix)]
return signal::kill(Pid::from_raw(pid as i32), signal::SIGCONT) == Ok(());
return unix_signal(pid, signal::SIGCONT);
unimplemented!(
"Unfreezing the Minecraft server process is not implemented on non-Unix platforms."
);
}
#[cfg(unix)]
pub fn unix_signal(pid: u32, signal: signal::Signal) -> bool {
return match signal::kill(Pid::from_raw(pid as i32), signal) {
Ok(()) => true,
Err(err) => {
warn!(target: "lazymc", "Sending {signal} signal to server failed: {err}");
false
}
};
}