X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fminecraft_controller.rs;h=4a9d754f9d13b4db800e8bb7f0af1e0570c4835b;hb=5f9313daeb4e845b8056f0922fc6966f73b04208;hp=be58549439b1917324b3ab9b67f540c7e495f25a;hpb=26d8ecd93415beb2d4d11376972cdfe412a73301;p=minecraft_web.git

diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs
index be58549..4a9d754 100644
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -4,7 +4,7 @@ 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].
@@ -15,7 +15,7 @@ pub struct MinecraftExe {
 
 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 {
@@ -146,7 +146,7 @@ pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str,
         Some(
             MinecraftExe {
                 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.processors().len() as f64 * 100.,
+                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,