From ab5e47d1ff107d99452109a96f86dc0ffc754a84 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Tue, 15 Aug 2023 23:06:09 +0200 Subject: [PATCH] Updated some logging stuff --- src/devices/hue_bridge.rs | 18 +++++++++--------- src/devices/washer.rs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/devices/hue_bridge.rs b/src/devices/hue_bridge.rs index f90eb09..b72c77c 100644 --- a/src/devices/hue_bridge.rs +++ b/src/devices/hue_bridge.rs @@ -175,10 +175,10 @@ impl OnOff for HueLight { Ok(res) => { let status = res.status(); if !status.is_success() { - warn!(self.identifier, "Status code is not success: {status}"); + warn!(id = self.identifier, "Status code is not success: {status}"); } } - Err(err) => error!(self.identifier, "Error: {err}"), + Err(err) => error!(id = self.identifier, "Error: {err}"), } Ok(()) @@ -196,14 +196,14 @@ impl OnOff for HueLight { Ok(res) => { let status = res.status(); if !status.is_success() { - warn!(self.identifier, "Status code is not success: {status}"); + warn!(id = self.identifier, "Status code is not success: {status}"); } let v: Value = serde_json::from_slice(res.bytes().await.unwrap().as_ref()).unwrap(); // TODO: This is not very nice return Ok(v["state"]["on"].as_bool().unwrap()); } - Err(err) => error!(self.identifier, "Error: {err}"), + Err(err) => error!(id = self.identifier, "Error: {err}"), } Ok(false) @@ -226,7 +226,7 @@ impl Timeout for HueLight { let hours = timeout.as_secs() / 3600; let time = format!("PT{hours:<02}:{minutes:<02}:{seconds:<02}"); - debug!(self.identifier, "Starting timeout ({time})..."); + debug!(id = self.identifier, "Starting timeout ({time})..."); let res = reqwest::Client::new() .put(url) @@ -238,10 +238,10 @@ impl Timeout for HueLight { Ok(res) => { let status = res.status(); if !status.is_success() { - warn!(self.identifier, "Status code is not success: {status}"); + warn!(id = self.identifier, "Status code is not success: {status}"); } } - Err(err) => error!(self.identifier, "Error: {err}"), + Err(err) => error!(id = self.identifier, "Error: {err}"), } } @@ -261,10 +261,10 @@ impl Timeout for HueLight { Ok(res) => { let status = res.status(); if !status.is_success() { - warn!(self.identifier, "Status code is not success: {status}"); + warn!(id = self.identifier, "Status code is not success: {status}"); } } - Err(err) => error!(self.identifier, "Error: {err}"), + Err(err) => error!(id = self.identifier, "Error: {err}"), } } } diff --git a/src/devices/washer.rs b/src/devices/washer.rs index 16949ea..f62da95 100644 --- a/src/devices/washer.rs +++ b/src/devices/washer.rs @@ -80,7 +80,7 @@ impl OnMqtt for Washer { } }; - debug!(id = self.identifier, power, "Washer state update"); + // debug!(id = self.identifier, power, "Washer state update"); if power < self.threshold && self.running >= HYSTERESIS { // The washer is done running