Implement suggested changes
This commit is contained in:
parent
2e6551b009
commit
5ef7c54ec6
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -920,7 +920,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazymc"
|
name = "lazymc"
|
||||||
version = "0.2.8"
|
version = "0.2.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-std",
|
"async-std",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lazymc"
|
name = "lazymc"
|
||||||
version = "0.2.8"
|
version = "0.2.6"
|
||||||
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"
|
||||||
@ -52,6 +52,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] }
|
|||||||
log = "0.4"
|
log = "0.4"
|
||||||
minecraft-protocol = { git = "https://github.com/timvisee/rust-minecraft-protocol", rev = "edfdf87" }
|
minecraft-protocol = { git = "https://github.com/timvisee/rust-minecraft-protocol", rev = "edfdf87" }
|
||||||
named-binary-tag = "0.6"
|
named-binary-tag = "0.6"
|
||||||
|
nix = "0.26"
|
||||||
notify = "4.0"
|
notify = "4.0"
|
||||||
pretty_env_logger = "0.4"
|
pretty_env_logger = "0.4"
|
||||||
proxy-protocol = "0.5"
|
proxy-protocol = "0.5"
|
||||||
@ -82,7 +83,6 @@ async-std = { version = "1.9.0", default-features = false, optional = true }
|
|||||||
# Feature: lobby
|
# Feature: lobby
|
||||||
md-5 = { version = "0.10", optional = true }
|
md-5 = { version = "0.10", optional = true }
|
||||||
uuid = { version = "0.7", optional = true, features = ["v3"] }
|
uuid = { version = "0.7", optional = true, features = ["v3"] }
|
||||||
nix = "0.26"
|
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
|
@ -33,7 +33,7 @@ directory = "."
|
|||||||
# Warning: if using a bash script read: https://git.io/JMIKH
|
# Warning: if using a bash script read: https://git.io/JMIKH
|
||||||
command = "java -Xmx1G -Xms1G -jar server.jar --nogui"
|
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)
|
# Only works on Unix (Linux or MacOS)
|
||||||
#freeze_process = true
|
#freeze_process = true
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ use crate::util::serde::to_socket_addrs;
|
|||||||
pub const CONFIG_FILE: &str = "lazymc.toml";
|
pub const CONFIG_FILE: &str = "lazymc.toml";
|
||||||
|
|
||||||
/// Configuration version user should be using, or warning will be shown.
|
/// 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.
|
/// Load config from file, based on CLI arguments.
|
||||||
///
|
///
|
||||||
|
@ -45,7 +45,7 @@ pub fn freeze(pid: u32) -> bool {
|
|||||||
return unix_signal(pid, signal::SIGSTOP);
|
return unix_signal(pid, signal::SIGSTOP);
|
||||||
|
|
||||||
unimplemented!(
|
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);
|
return unix_signal(pid, signal::SIGCONT);
|
||||||
|
|
||||||
unimplemented!(
|
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"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ async fn connect_to_server_no_timeout(
|
|||||||
|
|
||||||
// Select server address to use, add magic if Forge
|
// Select server address to use, add magic if Forge
|
||||||
let server_addr = if config.server.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 {
|
} else {
|
||||||
config.server.address.ip().to_string()
|
config.server.address.ip().to_string()
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user