twin/lazymc
1
0
Fork 0
mirror of https://github.com/timvisee/lazymc.git synced 2025-05-19 12:50:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make server sleeping errors a bit more descriptive

Browse Source
This commit is contained in:
timvisee 2021-11-14 12:09:26 +01:00
parent f172587fd5
commit 69812f5b55
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monitor.rs
View File

@ -55,9 +55,7 @@ pub async fn monitor_server(config: Arc<Config>, server: Arc<Server>) {
// Sleep server when it's bedtime
if server.should_sleep(&config) {
info!(target: "lazymc::montior", "Server has been idle, sleeping...");
if !server.stop(&config).await {
warn!(target: "lazymc", "Failed to stop server");
}
server.stop(&config).await;
}
// Check whether we should force kill server

2
src/os/unix.rs
View File

@ -20,7 +20,7 @@ pub unsafe fn kill_gracefully(pid: u32) -> bool {
let result = libc::kill(pid as i32, libc::SIGTERM);
if result != 0 {
trace!(target: "lazymc", "SIGTERM failed: {}", result);
warn!(target: "lazymc", "Sending SIGTERM signal to server failed: {}", result);
}
result == 0

22
src/server.rs
View File

@ -210,6 +210,7 @@ impl Server {
// We must have a running process
let has_process = self.pid.lock().unwrap().is_some();
if !has_process {
debug!(target: "lazymc", "Tried to stop server, while no PID is known");
return false;
}
@ -225,6 +226,7 @@ impl Server {
return true;
}
warn!(target: "lazymc", "Failed to stop server, no more suitable stopping method to use");
false
}
@ -394,6 +396,7 @@ async fn stop_server_rcon(config: &Config, server: &Server) -> bool {
// RCON must be enabled
if !config.rcon.enabled {
trace!(target: "lazymc", "Not using RCON to stop server, disabled in config");
return false;
}
@ -414,6 +417,7 @@ async fn stop_server_rcon(config: &Config, server: &Server) -> bool {
// Invoke stop
if let Err(err) = rcon.cmd("stop").await {
error!(target: "lazymc", "Failed to invoke stop through RCON: {}", err);
return false;
}
// Set server to stopping state
@ -431,13 +435,21 @@ fn stop_server_signal(config: &Config, server: &Server) -> bool {
// Grab PID
let pid = match *server.pid.lock().unwrap() {
Some(pid) => pid,
None => return false,
None => {
debug!(target: "lazymc", "Could not send stop signal to server process, PID unknown");
return false;
}
};
// Set stopping state, send kill signal
// TODO: revert state on failure
server.update_state(State::Stopping, config);
crate::os::kill_gracefully(pid);
// Send kill signal
if !crate::os::kill_gracefully(pid) {
error!(target: "lazymc", "Failed to send stop signal to server process");
return false;
}
// Update from starting/started to stopping
server.update_state_from(Some(State::Starting), State::Stopping, config);
server.update_state_from(Some(State::Started), State::Stopping, config);
true
}