X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fminecraft_controller.rs;h=4a9d754f9d13b4db800e8bb7f0af1e0570c4835b;hb=HEAD;hp=9287cdae762389bbebff8039ac8cc953f24af540;hpb=4524f6e31cc7165b16a1480979fced43c9066016;p=minecraft_web.git

diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs
index 9287cda..4a9d754 100644
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -1,22 +1,21 @@
-use sysinfo::{ ProcessExt, SystemExt };
-
 use std::{ fs, time::SystemTime };
-
+use sysinfo::{ ProcessExt, SystemExt };
 use chrono::{ DateTime, offset::Local };
 
 #[derive(Clone, Debug)]
 pub struct MinecraftExe {
-    memory: u64, // [kB].
+    memory: u64, // [B].
     load_average_5min: f64, // [%].
     uptime: u64, // [s].
     world_size: u64, // [B].
     active_players: Vec<String>,
+    version: String,
     last_backup: Option<SystemTime>,
 }
 
 impl MinecraftExe {
     pub fn format_memory(&self) -> String {
-        format_byte_size(self.memory * 1024, 2)
+        format_byte_size(self.memory, 2)
     }
 
     pub fn format_load_average(&self) -> String {
@@ -42,6 +41,10 @@ impl MinecraftExe {
         }
     }
 
+    pub fn format_version(&self) -> String {
+        self.version.clone()
+    }
+
     pub fn format_last_backup(&self) -> String {
         match self.last_backup {
             Some(t) => {
@@ -74,7 +77,7 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 const MINECRAFT_PROCESS_NAME: &str = "java";
 
 struct StatusFromRcon {
-    players: Vec<String>,
+    players: Vec<String>
 }
 
 fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
@@ -89,7 +92,7 @@ fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
                             Ok(resp) =>
                                 match resp.body.find(':') {
                                     Some(i) if i < resp.body.len() -1 =>
-                                        resp.body[i + 1..resp.body.len() - 1]
+                                        resp.body[i + 1..resp.body.len()]
                                             .split(',')
                                             .map(|nick| nick.trim().to_string())
                                             .filter(|nick| !nick.is_empty())
@@ -132,23 +135,22 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str, rcon_password: &str) -> Option<MinecraftExe> {
     let mut system = sysinfo::System::new_all();
     system.refresh_system();
-    let processes = system.get_process_by_name(MINECRAFT_PROCESS_NAME);
+    let mut processes = system.processes_by_name(MINECRAFT_PROCESS_NAME);
 
     // TODO: find the correct process by checking the correct jar name in parameters.
-    if processes.len() >= 1 {
-        let process = processes.first().unwrap();
-
+    if let Some(process) = processes.next() {
         let world_size = match fs_extra::dir::get_size(world_path) { Ok(l) => l, Err(_) => 0u64 };
 
         let status_from_rcon = get_status_from_rcon(rcon_password);
 
         Some(
             MinecraftExe {
-                memory: process.memory(),
-                load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,
+                memory: process.memory() / 3, // Because the Java garbage collector ZGC reports three times more the real memory usage: https://stackoverflow.com/a/62934057/212675
+                load_average_5min: system.load_average().five / system.cpus().len() as f64 * 100.,
                 uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
                 world_size,
                 active_players: status_from_rcon.players,
+                version: process.cmd()[process.cmd().len() - 2].clone(), // TODO: Extract the version from the .jar filename.
                 last_backup: get_last_backup_datetime(backup_path)
             }
         )