From: Greg Burri Date: Mon, 19 Sep 2022 08:14:41 +0000 (+0200) Subject: Update dependencies. X-Git-Url: http://git.euphorik.ch/?p=valheim_web.git;a=commitdiff_plain;h=c6b54f676e513e2b43a9190f2afae5178641f978 Update dependencies. --- diff --git a/Cargo.lock b/Cargo.lock index eda05a6..0a81471 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -392,9 +392,9 @@ dependencies = [ [[package]] name = "cached" -version = "0.34.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadf76ddea74bab35ebeb8f1eb115b9bc04eaee42d8acc0d5f477dee6b176c9a" +checksum = "f3e27085975166ffaacbd04527132e1cf5906fa612991f9b4fea08e787da2961" dependencies = [ "async-trait", "async_once", @@ -402,6 +402,7 @@ dependencies = [ "cached_proc_macro_types", "futures", "hashbrown 0.12.0", + "instant", "lazy_static", "once_cell", "thiserror", @@ -410,9 +411,9 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.12.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce0f37f9b77c6b93cdf3f060c89adca303d2ab052cacb3c3d1ab543e8cecd2f" +checksum = "751f7f4e7a091545e7f6c65bacc404eaee7e87bfb1f9ece234a1caa173dc16f2" dependencies = [ "cached_proc_macro_types", "darling", @@ -910,6 +911,15 @@ dependencies = [ "hashbrown 0.11.2", ] +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + [[package]] name = "itertools" version = "0.10.3" @@ -1299,9 +1309,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "ron" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", "bitflags", @@ -1439,9 +1449,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.23.8" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad04c584871b8dceb769a20b94e26a357a870c999b7246dcd4cb233d927547e3" +checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1" dependencies = [ "cfg-if", "core-foundation-sys", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 1c22b3c..f6d340b 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -11,14 +11,14 @@ askama_actix = "0.13" serde = { version = "1.0", features = ["derive"] } -ron = "0.7" # Rust object notation, to load configuration files. +ron = "0.8" # Rust object notation, to load configuration files. itertools = "0.10" chrono = "0.4" -sysinfo = "0.23" +sysinfo = "0.26" -cached = "0.34" +cached = "0.39" futures = "0.3" # Needed by askam with the feature 'with-actix-web'. diff --git a/backend/src/valheim_controller.rs b/backend/src/valheim_controller.rs index 631f46b..aa0ff31 100644 --- a/backend/src/valheim_controller.rs +++ b/backend/src/valheim_controller.rs @@ -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(),