X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fvalheim_controller.rs;fp=backend%2Fsrc%2Fvalheim_controller.rs;h=f92e63d459fc6735bdc3b591f7e4970db4b98f39;hb=aa59a1f9b79009079a5a1fbafd4f65d3130e9ee2;hp=6fa6c7ff996bbf1397a6968b9c341cd0d1b577bf;hpb=83993038d45c0d11c11417f9b47e19eb61e53928;p=valheim_web.git

diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs
index 6fa6c7f..f92e63d 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")]
@@ -75,7 +74,11 @@ fn format_byte_size(bytes: u64, precision: usize) -> String {
 }
 
 const VALHEIM_PROCESS_NAME: &str = "valheim_server";
+
+#[cfg(target_os = "linux")]
 const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";
+
+#[cfg(target_os = "linux")]
 const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";
 
 #[cfg(target_os = "linux")]
@@ -150,17 +153,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.processors().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(),