From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 8 Apr 2022 15:23:05 +0000 (+0200)
Subject: Merge branch 'master' of gburri.org:minecraft_web into master
X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;h=c849abb7645a38c4fcb91222b399f0914287527a;hp=34c1bf4bcb51473466ee9398cb63f0049ddc06a0;p=minecraft_web.git

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
--- 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
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -1,7 +1,5 @@
-use sysinfo::{ ProcessExt, SystemExt };
-
 use std::{ fs, time::SystemTime };
-
+use sysinfo::{ ProcessExt, SystemExt };
 use chrono::{ DateTime, offset::Local };
 
 #[derive(Clone, Debug)]
@@ -142,7 +140,7 @@ pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str,
 
         Some(
             MinecraftExe {
-                memory: process.memory(),
+                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.,
                 uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
                 world_size,
diff --git a/backend/src/tests.rs b/backend/src/tests.rs
deleted file mode 100644
index 0ee7ce1..0000000
--- a/backend/src/tests.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//use minecraft_controller::*;
-
-#[test]
-fn test1() {
-    assert_eq!(2, 1 + 1);
-}
\ No newline at end of file