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

diff --git a/backend/src/main.rs b/backend/src/main.rs
index 2129033..c4d7d50 100644 (file)
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -1,7 +1,6 @@
 extern crate askama;
 
 use std::{ sync::Mutex, env::args, fs::File, io::prelude::* };
-
 use actix_files as fs;
 use actix_web::{ get, web, Responder, middleware, App, HttpServer };
 use askama::Template;
@@ -10,7 +9,6 @@ use serde::{ Deserialize, Serialize };
 use cached::proc_macro::cached;
 
 mod consts;
-mod tests;
 mod minecraft_controller;
 
 #[derive(Template)]
@@ -56,7 +54,8 @@ async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
                 uptime: value_unknown.clone(),
                 world_size: value_unknown.clone(),
                 active_players: value_unknown.clone(),
-                last_backup: value_unknown.clone() }
+                last_backup: value_unknown.clone()
+            }
         }
     }
 }

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

diff --git a/backend/src/tests.rs b/backend/src/tests.rs
deleted file mode 100644 (file)
index 0ee7ce1..0000000
--- a/backend/src/tests.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//use minecraft_controller::*;\r
-\r
-#[test]\r
-fn test1() {\r
-    assert_eq!(2, 1 + 1);\r
-}
\ No newline at end of file