From d0c92e8e18aa198b9e305ac28d18049755360f8b Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Thu, 5 Jan 2023 03:01:31 +0100
Subject: [PATCH] Changed some logging

---
 src/devices/audio_setup.rs |  4 ++--
 src/devices/ikea_outlet.rs |  4 ++--
 src/devices/wake_on_lan.rs | 18 +++++++++---------
 src/light_sensor.rs        |  4 ++--
 src/ntfy.rs                |  2 +-
 src/presence.rs            |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/devices/audio_setup.rs b/src/devices/audio_setup.rs
index 5ce5c0c..a4b118a 100644
--- a/src/devices/audio_setup.rs
+++ b/src/devices/audio_setup.rs
@@ -6,7 +6,7 @@ use google_home::errors::{ErrorCode, DeviceError};
 use google_home::traits::{self, OnOff};
 use rumqttc::AsyncClient;
 use serde::{Deserialize, Serialize};
-use tracing::warn;
+use tracing::{error, warn};
 use pollster::FutureExt as _;
 
 use crate::config::MqttDeviceConfig;
@@ -232,7 +232,7 @@ impl OnMqtt for AudioSetup {
         let action = match RemoteMessage::try_from(message) {
             Ok(message) => message.action(),
             Err(err) => {
-                warn!(id = self.identifier, "Failed to parse message: {err}");
+                error!(id = self.identifier, "Failed to parse message: {err}");
                 return;
             }
         };
diff --git a/src/devices/ikea_outlet.rs b/src/devices/ikea_outlet.rs
index b1d8077..6e3d3c3 100644
--- a/src/devices/ikea_outlet.rs
+++ b/src/devices/ikea_outlet.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use google_home::errors::ErrorCode;
 use google_home::{GoogleHomeDevice, device, types::Type, traits};
 use rumqttc::{AsyncClient, Publish};
-use tracing::{debug, trace, warn};
+use tracing::{debug, trace, error};
 use tokio::task::JoinHandle;
 use pollster::FutureExt as _;
 
@@ -55,7 +55,7 @@ impl OnMqtt for IkeaOutlet {
         let state = match OnOffMessage::try_from(message) {
             Ok(state) => state.state(),
             Err(err) => {
-                warn!(id = self.identifier, "Failed to parse message: {err}");
+                error!(id = self.identifier, "Failed to parse message: {err}");
                 return;
             }
         };
diff --git a/src/devices/wake_on_lan.rs b/src/devices/wake_on_lan.rs
index 4b62565..a7d1729 100644
--- a/src/devices/wake_on_lan.rs
+++ b/src/devices/wake_on_lan.rs
@@ -1,5 +1,5 @@
 use google_home::{GoogleHomeDevice, types::Type, device, traits::{self, Scene}, errors::{ErrorCode, DeviceError}};
-use tracing::{debug, warn};
+use tracing::{debug, error};
 use rumqttc::{AsyncClient, Publish};
 use pollster::FutureExt as _;
 
@@ -38,7 +38,7 @@ impl OnMqtt for WakeOnLAN {
         let activate = match ActivateMessage::try_from(message) {
             Ok(message) => message.activate(),
             Err(err) => {
-                warn!(id = self.identifier, "Failed to parse message: {err}");
+                error!(id = self.identifier, "Failed to parse message: {err}");
                 return;
             }
         };
@@ -81,17 +81,17 @@ impl traits::Scene for WakeOnLAN {
             let id = self.identifier.clone();
 
             debug!(id, "Activating Computer: {}", mac_address);
-            let req = match reqwest::get(format!("http://10.0.0.2:9000/start-pc?mac={mac_address}")).block_on() {
-                Ok(req) => req,
+            let res = match reqwest::get(format!("http://10.0.0.2:9000/start-pc?mac={mac_address}")).block_on() {
+                Ok(res) => res,
                 Err(err) => {
-                    warn!(id, "Failed to call webhook: {err}");
-                    // @TODO Handle error
-                    return Ok(());
+                    error!(id, "Failed to call webhook: {err}");
+                    return Err(DeviceError::TransientError.into());
                 }
             };
 
-            if req.status() != 200 {
-                warn!(id, "Failed to call webhook: {}", req.status());
+            let status = res.status();
+            if !status.is_success() {
+                error!(id, "Failed to call webhook: {}", status);
             }
 
             Ok(())
diff --git a/src/light_sensor.rs b/src/light_sensor.rs
index 97e0e69..b3f235e 100644
--- a/src/light_sensor.rs
+++ b/src/light_sensor.rs
@@ -2,7 +2,7 @@ use std::sync::{Weak, RwLock};
 
 use pollster::FutureExt as _;
 use rumqttc::AsyncClient;
-use tracing::{span, Level, log::{warn, trace}, debug};
+use tracing::{span, Level, log::{error, trace}, debug};
 
 use crate::{config::{MqttDeviceConfig, LightSensorConfig}, mqtt::{OnMqtt, BrightnessMessage}};
 
@@ -49,7 +49,7 @@ impl OnMqtt for LightSensor {
         let illuminance = match BrightnessMessage::try_from(message) {
             Ok(state) => state.illuminance(),
             Err(err) => {
-                warn!("Failed to parse message: {err}");
+                error!("Failed to parse message: {err}");
                 return;
             }
         };
diff --git a/src/ntfy.rs b/src/ntfy.rs
index 52b39d7..bc0118b 100644
--- a/src/ntfy.rs
+++ b/src/ntfy.rs
@@ -128,7 +128,7 @@ impl OnPresence for Ntfy {
             error!("Something went wrong while sending the notifcation: {err}");
         } else if let Ok(res) = res {
             let status = res.status();
-            if status != StatusCode::OK {
+            if !status.is_success() {
                 warn!("Received status {status} when sending notification");
             }
         }
diff --git a/src/presence.rs b/src/presence.rs
index 1ede13b..679ab61 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -1,6 +1,6 @@
 use std::{sync::{Weak, RwLock}, collections::HashMap};
 
-use tracing::{debug, warn, span, Level};
+use tracing::{debug, span, Level, error};
 use rumqttc::AsyncClient;
 use pollster::FutureExt as _;
 
@@ -54,7 +54,7 @@ impl OnMqtt for Presence {
                 let present = match PresenceMessage::try_from(message) {
                     Ok(state) => state.present(),
                     Err(err) => {
-                        warn!("Failed to parse message: {err}");
+                        error!("Failed to parse message: {err}");
                         return;
                     }
                 };