Simplify iteration errors

watchers/src/watchers.rs

@@ -64,12 +64,14 @@ pub trait Watcher: Send {
                 warn!("Received an exit signal, shutting down {watcher_type}");
                 break;
             }
-            self.run_iteration(client);
+            if let Err(e) = self.run_iteration(client) {
+                error!("Error on {watcher_type} iteration: {e}");
+            }
             thread::sleep(watcher_type.sleep_time(&client.config));
         }
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>);
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()>;
 }
 
 type BoxedWatcher = Box<dyn Watcher>;

watchers/src/watchers/gnome_idle.rs

@@ -36,12 +36,9 @@ impl Watcher for IdleWatcher {
         Ok(watcher)
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        match idle::ping_since_last_input(self, self.is_idle, client) {
-            Ok(is_idle_again) => {
-                self.is_idle = is_idle_again;
-            }
-            Err(e) => error!("Error on idle iteration: {e}"),
-        };
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.is_idle = idle::ping_since_last_input(self, self.is_idle, client)?;
+
+        Ok(())
     }
 }

watchers/src/watchers/gnome_window.rs

@@ -85,9 +85,7 @@ impl Watcher for WindowWatcher {
         Ok(watcher)
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        if let Err(error) = self.send_active_window(client) {
-            error!("Error on active window: {error}");
-        }
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.send_active_window(client)
     }
 }

watchers/src/watchers/kwin_window.rs

@@ -201,9 +201,7 @@ impl Watcher for WindowWatcher {
         })
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        if let Err(error) = send_active_window(client, &self.active_window) {
-            error!("Error on sending active window: {error}");
-        }
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        send_active_window(client, &self.active_window)
     }
 }

watchers/src/watchers/wl_foreign_toplevel.rs

@@ -155,15 +155,12 @@ impl Watcher for WindowWatcher {
         })
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        if let Err(e) = self
-            .connection
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.connection
             .event_queue
             .roundtrip(&mut self.toplevel_state)
-        {
-            error!("Event queue is not processed: {e}");
-        } else if let Err(e) = self.send_active_window(client) {
-            error!("Error on iteration: {e}");
-        }
+            .map_err(|e| anyhow!("Event queue is not processed: {e}"))?;
+
+        self.send_active_window(client)
     }
 }

watchers/src/watchers/wl_kwin_idle.rs

@@ -2,6 +2,7 @@ use super::wl_bindings;
 use super::wl_connection::{subscribe_state, WlEventConnection};
 use super::Watcher;
 use crate::report_client::ReportClient;
+use anyhow::anyhow;
 use chrono::{DateTime, Duration, Utc};
 use std::sync::Arc;
 use wayland_client::{
@@ -131,11 +132,12 @@ impl Watcher for IdleWatcher {
         })
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        if let Err(e) = self.connection.event_queue.roundtrip(&mut self.idle_state) {
-            error!("Event queue is not processed: {e}");
-        } else if let Err(e) = self.idle_state.send_ping(client) {
-            error!("Error on idle iteration: {e}");
-        }
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.connection
+            .event_queue
+            .roundtrip(&mut self.idle_state)
+            .map_err(|e| anyhow!("Event queue is not processed: {e}"))?;
+
+        self.idle_state.send_ping(client)
     }
 }

watchers/src/watchers/x11_screensaver_idle.rs

@@ -26,12 +26,9 @@ impl Watcher for IdleWatcher {
         })
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        match idle::ping_since_last_input(self, self.is_idle, client) {
-            Ok(is_idle_again) => {
-                self.is_idle = is_idle_again;
-            }
-            Err(e) => error!("Error on idle iteration: {e}"),
-        };
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.is_idle = idle::ping_since_last_input(self, self.is_idle, client)?;
+
+        Ok(())
     }
 }

watchers/src/watchers/x11_window.rs

@@ -40,9 +40,7 @@ impl Watcher for WindowWatcher {
         })
     }
 
-    fn run_iteration(&mut self, client: &Arc<ReportClient>) {
-        if let Err(error) = self.send_active_window(client) {
-            error!("Error on sending active window: {error}");
-        }
+    fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()> {
+        self.send_active_window(client)
     }
 }