2 Commits

Author SHA1 Message Date
timvisee
e54025f02f Bump version to 0.2.10 2023-02-20 10:34:06 +01:00
timvisee
023e46fe64 Allow exit code 143 and 130
Fixes https://github.com/timvisee/lazymc/issues/26
2023-02-20 10:31:04 +01:00
5 changed files with 18 additions and 8 deletions

View File

@@ -1,5 +1,9 @@
# Changelog # Changelog
## 0.2.10 (2023-02-20)
- Do not report an error when server exits with status code 143
## 0.2.9 (2023-02-14) ## 0.2.9 (2023-02-14)
- Fix dropping all connections when `server.drop_banned_ips` was enabled - Fix dropping all connections when `server.drop_banned_ips` was enabled

2
Cargo.lock generated
View File

@@ -926,7 +926,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]] [[package]]
name = "lazymc" name = "lazymc"
version = "0.2.9" version = "0.2.10"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-std", "async-std",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "lazymc" name = "lazymc"
version = "0.2.9" version = "0.2.10"
authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"] authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"]
license = "GPL-3.0" license = "GPL-3.0"
readme = "README.md" readme = "README.md"

View File

@@ -187,4 +187,4 @@ command = "java -Xmx1G -Xms1G -jar server.jar --nogui"
[config] [config]
# lazymc version this configuration is for. # lazymc version this configuration is for.
# Don't change unless you know what you're doing. # Don't change unless you know what you're doing.
version = "0.2.9" version = "0.2.10"

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
} }