diff --git a/Cargo.lock b/Cargo.lock index 0f1b5ee..7d22102 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -920,7 +920,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lazymc" -version = "0.2.8" +version = "0.2.6" dependencies = [ "anyhow", "async-std", diff --git a/Cargo.toml b/Cargo.toml index 26f26b7..809b674 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lazymc" -version = "0.2.8" +version = "0.2.6" authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"] license = "GPL-3.0" readme = "README.md" @@ -52,6 +52,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] } log = "0.4" minecraft-protocol = { git = "https://github.com/timvisee/rust-minecraft-protocol", rev = "edfdf87" } named-binary-tag = "0.6" +nix = "0.26" notify = "4.0" pretty_env_logger = "0.4" proxy-protocol = "0.5" @@ -82,7 +83,6 @@ async-std = { version = "1.9.0", default-features = false, optional = true } # Feature: lobby md-5 = { version = "0.10", optional = true } uuid = { version = "0.7", optional = true, features = ["v3"] } -nix = "0.26" [target.'cfg(unix)'.dependencies] libc = "0.2" diff --git a/res/lazymc.toml b/res/lazymc.toml index e1f35e8..15050f6 100644 --- a/res/lazymc.toml +++ b/res/lazymc.toml @@ -33,7 +33,7 @@ directory = "." # Warning: if using a bash script read: https://git.io/JMIKH command = "java -Xmx1G -Xms1G -jar server.jar --nogui" -# Freeze the server process instead of restarting it when no players online, making it start up faster. +# Freeze the server process instead of restarting it when no players online, making it resume faster. # Only works on Unix (Linux or MacOS) #freeze_process = true diff --git a/src/config.rs b/src/config.rs index 26434bb..74f997d 100644 --- a/src/config.rs +++ b/src/config.rs @@ -15,7 +15,7 @@ use crate::util::serde::to_socket_addrs; pub const CONFIG_FILE: &str = "lazymc.toml"; /// Configuration version user should be using, or warning will be shown. -const CONFIG_VERSION: &str = "0.2.8"; +const CONFIG_VERSION: &str = "0.2.6"; /// Load config from file, based on CLI arguments. /// diff --git a/src/os/mod.rs b/src/os/mod.rs index f445ba3..348f56f 100644 --- a/src/os/mod.rs +++ b/src/os/mod.rs @@ -45,7 +45,7 @@ pub fn freeze(pid: u32) -> bool { return unix_signal(pid, signal::SIGSTOP); unimplemented!( - "Freezing the Minecraft server process is not implemented on non-Unix platforms." + "freezing the Minecraft server process is not implemented on non-Unix platforms" ); } @@ -60,7 +60,7 @@ pub fn unfreeze(pid: u32) -> bool { return unix_signal(pid, signal::SIGCONT); unimplemented!( - "Unfreezing the Minecraft server process is not implemented on non-Unix platforms." + "unfreezing the Minecraft server process is not implemented on non-Unix platforms" ); } diff --git a/src/probe.rs b/src/probe.rs index 9820047..8ba6462 100644 --- a/src/probe.rs +++ b/src/probe.rs @@ -157,7 +157,7 @@ async fn connect_to_server_no_timeout( // Select server address to use, add magic if Forge let server_addr = if config.server.forge { - format!("{}{}", config.server.address.ip(), forge::STATUS_MAGIC,) + format!("{}{}", config.server.address.ip(), forge::STATUS_MAGIC) } else { config.server.address.ip().to_string() };