X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fvalheim_controller.rs;h=a7f10b5ae17d1579eb77f96964b5ba9bced64d23;hb=HEAD;hp=33c532f20cabe09de0133f42b511eee9b6e8158d;hpb=b0336a574d710ba48449d7330b332c18231df1c5;p=valheim_web.git

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index 33c532f..a7f10b5 100644
--- a/backend/src/valheim_controller.rs
+++ b/backend/src/valheim_controller.rs
@@ -1,7 +1,6 @@
-use sysinfo::{ ProcessExt, SystemExt };
 
 use std::{ fs, time::SystemTime };
-
+use sysinfo::{ ProcessExt, SystemExt };
 use chrono::{ DateTime, offset::Local };
 
 #[cfg(target_os = "linux")]
@@ -9,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].
@@ -19,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 {
@@ -157,17 +156,16 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_valheim_executable_information(world_path: &str, backup_path: &str) -> Option<ValheimExe> {
     let mut system = sysinfo::System::new_all();
     system.refresh_system();
-    let processes = system.get_process_by_name(VALHEIM_PROCESS_NAME);
+    let mut processes = system.processes_by_name(VALHEIM_PROCESS_NAME);
 
-    if processes.len() >= 1 {
-        let process = processes.first().unwrap();
+    if let Some(process) = processes.next() {
 
         let world_size = match std::fs::metadata(world_path) { Ok(f) => f.len(), Err(_) => 0u64 };
 
         Some(
             ValheimExe {
                 memory: process.memory(),
-                load_average_5min: system.get_load_average().five / system.get_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(),