X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fvalheim_controller.rs;h=a7f10b5ae17d1579eb77f96964b5ba9bced64d23;hb=HEAD;hp=631f46b5c22b3c4857afd1690b3f72007186520c;hpb=e1d2ac7d318ed90b941bdc9911d6c22474c1f535;p=valheim_web.git diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs index 631f46b..a7f10b5 100644 --- a/backend/src/valheim_controller.rs +++ b/backend/src/valheim_controller.rs @@ -8,7 +8,7 @@ use systemd::journal; #[derive(Clone, Debug)] pub struct ValheimExe { - memory: u64, // [kB]. + memory: u64, // [B]. load_average_5min: f64, // [%]. uptime: u64, // [s]. world_size: u64, // [B]. @@ -18,7 +18,7 @@ pub struct ValheimExe { impl ValheimExe { 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 { @@ -165,7 +165,7 @@ pub fn get_valheim_executable_information(world_path: &str, backup_path: &str) - Some( ValheimExe { memory: process.memory(), - 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: get_active_players(),