-use sysinfo::{ ProcessExt, SystemExt };\r
-\r
use std::{ fs, time::SystemTime };\r
-\r
+use sysinfo::{ ProcessExt, SystemExt };\r
use chrono::{ DateTime, offset::Local };\r
\r
#[derive(Clone, Debug)]\r
uptime: u64, // [s].\r
world_size: u64, // [B].\r
active_players: Vec<String>,\r
+ version: String,\r
last_backup: Option<SystemTime>,\r
}\r
\r
}\r
}\r
\r
+ pub fn format_version(&self) -> String {\r
+ self.version.clone()\r
+ }\r
+\r
pub fn format_last_backup(&self) -> String {\r
match self.last_backup {\r
Some(t) => {\r
\r
struct StatusFromRcon {\r
players: Vec<String>,\r
+ version: String,\r
}\r
\r
fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {\r
println!("Error from 'list' command");\r
Vec::new()\r
},\r
+ },\r
+ version:\r
+ match client.send_command("version".to_string()) {\r
+ Ok(resp) => resp.body,\r
+ Err(_e) => {\r
+ println!("Error from 'version' command");\r
+ String::new()\r
+ }\r
}\r
}\r
},\r
Err(_e) => {\r
println!("Authentication error");\r
- StatusFromRcon { players: Vec::new() }\r
+ StatusFromRcon { players: Vec::new(), version: String::new() }\r
},\r
};\r
\r
\r
Some(\r
MinecraftExe {\r
- memory: process.memory(),\r
+ memory: process.memory() / 3, // Because the Java garbage collector ZGC reports three times more the real memory usage: https://stackoverflow.com/a/62934057/212675\r
load_average_5min: system.load_average().five / system.processors().len() as f64 * 100.,\r
uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),\r
world_size,\r
active_players: status_from_rcon.players,\r
+ version: status_from_rcon.version,\r
last_backup: get_last_backup_datetime(backup_path)\r
}\r
)\r