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

Allow exit code 143 and 130

Browse Source 
Fixes https://github.com/timvisee/lazymc/issues/26
This commit is contained in:
timvisee 2023-02-20 10:31:04 +01:00
parent 6622962d5d
commit 023e46fe64
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server.rs
View File

@ -29,9 +29,11 @@ const SERVER_QUIT_COOLDOWN: Duration = Duration::from_millis(2500);
#[cfg(feature = "rcon")] #[cfg(feature = "rcon")]
const RCON_COOLDOWN: Duration = Duration::from_secs(15); const RCON_COOLDOWN: Duration = Duration::from_secs(15);
/// Exit code when SIGTERM is received on Unix. /// Exit codes that are allowed.
#[cfg(unix)] ///
const UNIX_EXIT_SIGTERM: i32 = 130; /// - 143: https://github.com/timvisee/lazymc/issues/26#issuecomment-1435670029
/// - 130: https://unix.stackexchange.com/q/386836/61092
const ALLOWED_EXIT_CODES: [i32; 2] = [130, 143];
/// Shared server state. /// Shared server state.
#[derive(Debug)] #[derive(Debug)]
@ -496,8 +498,12 @@ pub async fn invoke_server_cmd(
debug!(target: "lazymc", "Server process stopped successfully ({})", status); debug!(target: "lazymc", "Server process stopped successfully ({})", status);
false false
} }
#[cfg(unix)] Ok(status)
Ok(status) if status.code() == Some(UNIX_EXIT_SIGTERM) => { if status
.code()
.map(|ref code| ALLOWED_EXIT_CODES.contains(code))
.unwrap_or(false) =>
{
debug!(target: "lazymc", "Server process stopped successfully by SIGTERM ({})", status); debug!(target: "lazymc", "Server process stopped successfully by SIGTERM ({})", status);
false false
} }