Changed some logging

This commit is contained in:
Dreaded_X 2023-01-05 03:01:31 +01:00
parent f88c7a5695
commit d0c92e8e18
Signed by: Dreaded_X
GPG Key ID: 76BDEC4E165D8AD9
6 changed files with 18 additions and 18 deletions

View File

@ -6,7 +6,7 @@ use google_home::errors::{ErrorCode, DeviceError};
use google_home::traits::{self, OnOff}; use google_home::traits::{self, OnOff};
use rumqttc::AsyncClient; use rumqttc::AsyncClient;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::warn; use tracing::{error, warn};
use pollster::FutureExt as _; use pollster::FutureExt as _;
use crate::config::MqttDeviceConfig; use crate::config::MqttDeviceConfig;
@ -232,7 +232,7 @@ impl OnMqtt for AudioSetup {
let action = match RemoteMessage::try_from(message) { let action = match RemoteMessage::try_from(message) {
Ok(message) => message.action(), Ok(message) => message.action(),
Err(err) => { Err(err) => {
warn!(id = self.identifier, "Failed to parse message: {err}"); error!(id = self.identifier, "Failed to parse message: {err}");
return; return;
} }
}; };

View File

@ -3,7 +3,7 @@ use std::time::Duration;
use google_home::errors::ErrorCode; use google_home::errors::ErrorCode;
use google_home::{GoogleHomeDevice, device, types::Type, traits}; use google_home::{GoogleHomeDevice, device, types::Type, traits};
use rumqttc::{AsyncClient, Publish}; use rumqttc::{AsyncClient, Publish};
use tracing::{debug, trace, warn}; use tracing::{debug, trace, error};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
use pollster::FutureExt as _; use pollster::FutureExt as _;
@ -55,7 +55,7 @@ impl OnMqtt for IkeaOutlet {
let state = match OnOffMessage::try_from(message) { let state = match OnOffMessage::try_from(message) {
Ok(state) => state.state(), Ok(state) => state.state(),
Err(err) => { Err(err) => {
warn!(id = self.identifier, "Failed to parse message: {err}"); error!(id = self.identifier, "Failed to parse message: {err}");
return; return;
} }
}; };

View File

@ -1,5 +1,5 @@
use google_home::{GoogleHomeDevice, types::Type, device, traits::{self, Scene}, errors::{ErrorCode, DeviceError}}; 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 rumqttc::{AsyncClient, Publish};
use pollster::FutureExt as _; use pollster::FutureExt as _;
@ -38,7 +38,7 @@ impl OnMqtt for WakeOnLAN {
let activate = match ActivateMessage::try_from(message) { let activate = match ActivateMessage::try_from(message) {
Ok(message) => message.activate(), Ok(message) => message.activate(),
Err(err) => { Err(err) => {
warn!(id = self.identifier, "Failed to parse message: {err}"); error!(id = self.identifier, "Failed to parse message: {err}");
return; return;
} }
}; };
@ -81,17 +81,17 @@ impl traits::Scene for WakeOnLAN {
let id = self.identifier.clone(); let id = self.identifier.clone();
debug!(id, "Activating Computer: {}", mac_address); 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() { let res = match reqwest::get(format!("http://10.0.0.2:9000/start-pc?mac={mac_address}")).block_on() {
Ok(req) => req, Ok(res) => res,
Err(err) => { Err(err) => {
warn!(id, "Failed to call webhook: {err}"); error!(id, "Failed to call webhook: {err}");
// @TODO Handle error return Err(DeviceError::TransientError.into());
return Ok(());
} }
}; };
if req.status() != 200 { let status = res.status();
warn!(id, "Failed to call webhook: {}", req.status()); if !status.is_success() {
error!(id, "Failed to call webhook: {}", status);
} }
Ok(()) Ok(())

View File

@ -2,7 +2,7 @@ use std::sync::{Weak, RwLock};
use pollster::FutureExt as _; use pollster::FutureExt as _;
use rumqttc::AsyncClient; 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}}; use crate::{config::{MqttDeviceConfig, LightSensorConfig}, mqtt::{OnMqtt, BrightnessMessage}};
@ -49,7 +49,7 @@ impl OnMqtt for LightSensor {
let illuminance = match BrightnessMessage::try_from(message) { let illuminance = match BrightnessMessage::try_from(message) {
Ok(state) => state.illuminance(), Ok(state) => state.illuminance(),
Err(err) => { Err(err) => {
warn!("Failed to parse message: {err}"); error!("Failed to parse message: {err}");
return; return;
} }
}; };

View File

@ -128,7 +128,7 @@ impl OnPresence for Ntfy {
error!("Something went wrong while sending the notifcation: {err}"); error!("Something went wrong while sending the notifcation: {err}");
} else if let Ok(res) = res { } else if let Ok(res) = res {
let status = res.status(); let status = res.status();
if status != StatusCode::OK { if !status.is_success() {
warn!("Received status {status} when sending notification"); warn!("Received status {status} when sending notification");
} }
} }

View File

@ -1,6 +1,6 @@
use std::{sync::{Weak, RwLock}, collections::HashMap}; use std::{sync::{Weak, RwLock}, collections::HashMap};
use tracing::{debug, warn, span, Level}; use tracing::{debug, span, Level, error};
use rumqttc::AsyncClient; use rumqttc::AsyncClient;
use pollster::FutureExt as _; use pollster::FutureExt as _;
@ -54,7 +54,7 @@ impl OnMqtt for Presence {
let present = match PresenceMessage::try_from(message) { let present = match PresenceMessage::try_from(message) {
Ok(state) => state.present(), Ok(state) => state.present(),
Err(err) => { Err(err) => {
warn!("Failed to parse message: {err}"); error!("Failed to parse message: {err}");
return; return;
} }
}; };