Merge branch 'master' of gburri.org:minecraft_web into master

[minecraft_web.git] / backend / src / minecraft_controller.rs

diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs
index 8f67d20..54143e8 100644 (file)
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -1,7 +1,5 @@
-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
@@ -142,7 +140,7 @@ pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str,
 \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