Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e54025f02f | ||
|
023e46fe64 |
@@ -1,5 +1,9 @@
|
||||
# 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)
|
||||
|
||||
- Fix dropping all connections when `server.drop_banned_ips` was enabled
|
||||
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -926,7 +926,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "lazymc"
|
||||
version = "0.2.9"
|
||||
version = "0.2.10"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-std",
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "lazymc"
|
||||
version = "0.2.9"
|
||||
version = "0.2.10"
|
||||
authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"]
|
||||
license = "GPL-3.0"
|
||||
readme = "README.md"
|
||||
|
@@ -187,4 +187,4 @@ command = "java -Xmx1G -Xms1G -jar server.jar --nogui"
|
||||
[config]
|
||||
# lazymc version this configuration is for.
|
||||
# Don't change unless you know what you're doing.
|
||||
version = "0.2.9"
|
||||
version = "0.2.10"
|
||||
|
@@ -29,9 +29,11 @@ const SERVER_QUIT_COOLDOWN: Duration = Duration::from_millis(2500);
|
||||
#[cfg(feature = "rcon")]
|
||||
const RCON_COOLDOWN: Duration = Duration::from_secs(15);
|
||||
|
||||
/// Exit code when SIGTERM is received on Unix.
|
||||
#[cfg(unix)]
|
||||
const UNIX_EXIT_SIGTERM: i32 = 130;
|
||||
/// Exit codes that are allowed.
|
||||
///
|
||||
/// - 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.
|
||||
#[derive(Debug)]
|
||||
@@ -496,8 +498,12 @@ pub async fn invoke_server_cmd(
|
||||
debug!(target: "lazymc", "Server process stopped successfully ({})", status);
|
||||
false
|
||||
}
|
||||
#[cfg(unix)]
|
||||
Ok(status) if status.code() == Some(UNIX_EXIT_SIGTERM) => {
|
||||
Ok(status)
|
||||
if status
|
||||
.code()
|
||||
.map(|ref code| ALLOWED_EXIT_CODES.contains(code))
|
||||
.unwrap_or(false) =>
|
||||
{
|
||||
debug!(target: "lazymc", "Server process stopped successfully by SIGTERM ({})", status);
|
||||
false
|
||||
}
|
||||
|
Reference in New Issue
Block a user