Improve error handling

daft-panda · Sep 23, 2023 · acba64d · acba64d
1 parent 6dfc576
commit acba64d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/ebusd-thermostat/src/homeassistant.rs b/ebusd-thermostat/src/homeassistant.rs
@@ -1,6 +1,6 @@
 use anyhow::bail;
 use futures_util::{SinkExt, StreamExt};
-use log::{error, trace};
+use log::{debug, error, trace};
 use reqwest::{Client, Url};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -169,7 +169,19 @@ impl Api {
 
         tokio::spawn(async move {
             read.for_each(|msg| async {
-                let msg = msg.unwrap().into_text().unwrap();
+                let msg = match msg {
+                    Ok(v) => match v.into_text() {
+                        Ok(v) => v,
+                        Err(e) => {
+                            debug!("Failed to convert WS message into text: {}", e);
+                            return;
+                        }
+                    },
+                    Err(e) => {
+                        debug!("Failed to read WS message: {}", e);
+                        return;
+                    }
+                };
                 let ha_msg: HaMessage = match serde_json::from_str(&msg) {
                     Ok(v) => v,
                     Err(e) => {

diff --git a/ebusd-thermostat/src/main.rs b/ebusd-thermostat/src/main.rs
@@ -319,7 +319,8 @@ impl Thermostat {
                     None => {}
                     Some(e) => {
                         debug!("Original error: {}", e.to_string());
-                        if e.to_string().to_lowercase().contains("broken pipe") {
+                        let msg = e.to_string().to_lowercase();
+                        if msg.contains("broken pipe") || msg.contains("connection") {
                             debug!("Reconnecting...");
                             self.ebusd.reconnect().await?;
                             self.ebusd.define_message( "wi,BAI,SetModeOverride,Betriebsart,,08,B510,00,hcmode,,UCH,,,,flowtempdesired,,D1C,,,,hwctempdesired,,D1C,,,,hwcflowtempdesired,,UCH,,,,setmode1,,UCH,,,,disablehc,,BI0,,,,disablehwctapping,,BI1,,,,disablehwcload,,BI2,,,,setmode2,,UCH,,,,remoteControlHcPump,,BI0,,,,releaseBackup,,BI1,,,,releaseCooling,,BI2".to_string()).await?;