From d659bcbc3f96fe198c6c68f1a1710fa9df3531b1 Mon Sep 17 00:00:00 2001 From: desbma Date: Sun, 16 Jun 2024 17:14:06 +0200 Subject: [PATCH] feat: improve logging --- Cargo.toml | 2 +- src/device/drive.rs | 2 +- src/main.rs | 7 ++++--- src/probe/mod.rs | 7 +------ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0c18b11..35a3d79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ clap-num = { version = "1.1.1", default-features = false } humantime = { version = "2.1.0", default-features = false } int-enum = { version = "1.0.0", default-features = false } itertools = { version = "0.12.1", default-features = false, features = ["use_std"] } -log = { version = "0.4.20", default-features = false, features = ["max_level_trace", "release_max_level_debug"] } +log = { version = "0.4.20", default-features = false, features = ["max_level_trace", "release_max_level_trace"] } nix = { version = "0.27.1", default-features = false, features = ["fs"] } simple_logger = { version = "4.3.3", default-features = false, features = ["colors", "stderr"] } strum = { version = "0.26.1", default-features = false, features = ["std", "derive"] } diff --git a/src/device/drive.rs b/src/device/drive.rs index 76e9685..39a554d 100644 --- a/src/device/drive.rs +++ b/src/device/drive.rs @@ -11,7 +11,7 @@ use std::{ }; /// Drive runtime state -#[derive(strum::EnumString)] +#[derive(strum::EnumString, strum::Display)] #[strum(serialize_all = "lowercase")] pub enum State { /// Active/idle diff --git a/src/main.rs b/src/main.rs index 1fb7863..d439058 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,12 +114,13 @@ fn main() -> anyhow::Result<()> { .zip(drives.iter()) .map(|((prober, supports_probing_sleeping), drive)| { let state = drive.state()?; + log::debug!("Drive {drive} state: {state}"); let temp = if state.is_spun_down() && !*supports_probing_sleeping { - log::debug!("Drive {} is sleeping", drive); + log::debug!("Drive {drive} is sleeping"); None } else { let temp = prober.probe_temp()?; - log::debug!("Drive {}: {}°C", drive, temp); + log::debug!("Drive {drive}: {temp}°C"); Some(temp) }; Ok(temp) @@ -133,7 +134,7 @@ fn main() -> anyhow::Result<()> { .as_mut() .map(|(cpu, _range)| -> anyhow::Result<_> { let temp = cpu.probe_temp()?; - log::info!("CPU temperature: {}°C", temp); + log::info!("CPU temperature: {temp}°C"); Ok(temp) }) .map_or(Ok(None), |v| v.map(Some))?; diff --git a/src/probe/mod.rs b/src/probe/mod.rs index 9df98fe..7dd8d29 100644 --- a/src/probe/mod.rs +++ b/src/probe/mod.rs @@ -63,12 +63,7 @@ pub fn prober( return Ok(Some((p, sqa))); } Err(ProberError::Unsupported(e)) => { - log::info!( - "Drive '{}' does not support probing method '{}': {}", - drive, - method, - e - ); + log::info!("Drive '{drive}' does not support probing method '{method}': {e}",); } Err(ProberError::Other(e)) => return Err(e), }