apply pr review

Author: dignifiedquire

net-tools/netwatch/src/netmon.rs

@@ -4,7 +4,6 @@ use anyhow::Result;
 use futures_lite::future::Boxed as BoxFuture;
 use tokio::sync::{mpsc, oneshot};
 use tokio_util::task::AbortOnDropHandle;
-use tracing::warn;
 
 mod actor;
 #[cfg(target_os = "android")]
@@ -29,8 +28,7 @@ use self::actor::{Actor, ActorMessage};
 #[derive(Debug)]
 pub struct Monitor {
     /// Task handle for the monitor task.
-    #[allow(dead_code)]
-    handle: AbortOnDropHandle<()>,
+    _handle: AbortOnDropHandle<()>,
     actor_tx: mpsc::Sender<ActorMessage>,
 }
 
@@ -41,13 +39,11 @@ impl Monitor {
         let actor_tx = actor.subscribe();
 
         let handle = tokio::task::spawn(async move {
-            if let Err(err) = actor.run().await {
-                warn!("netmon actor died: {:?}", err);
-            }
+            actor.run().await;
         });
 
         Ok(Monitor {
-            handle: AbortOnDropHandle::new(handle),
+            _handle: AbortOnDropHandle::new(handle),
             actor_tx,
         })
     }

net-tools/netwatch/src/netmon/actor.rs

@@ -101,7 +101,7 @@ impl Actor {
         self.actor_sender.clone()
     }
 
-    pub(super) async fn run(mut self) -> Result<()> {
+    pub(super) async fn run(mut self) {
         const DEBOUNCE: Duration = Duration::from_millis(250);
 
         let mut last_event = None;
@@ -111,6 +111,7 @@ impl Actor {
         loop {
             tokio::select! {
                 biased;
+
                 _ = debounce_interval.tick() => {
                     if let Some(time_jumped) = last_event.take() {
                         if let Err(err) = self.handle_potential_change(time_jumped).await {
@@ -126,38 +127,43 @@ impl Actor {
                         debounce_interval.reset_immediately();
                     }
                 }
-                Some(event) = self.mon_receiver.recv() => {
+                event = self.mon_receiver.recv() => {
                     match event {
-                        NetworkMessage::Change => {
+                        Some(NetworkMessage::Change) => {
                             trace!("network activity detected");
                             last_event.replace(false);
                             debounce_interval.reset_immediately();
                         }
+                        None => {
+                            debug!("shutting down, network monitor receiver gone");
+                            break;
+                        }
                     }
                 }
-                Some(msg) = self.actor_receiver.recv() => match msg {
-                    ActorMessage::Subscribe(callback, s) => {
-                        let token = self.next_callback_token();
-                        self.callbacks.insert(token, Arc::new(callback));
-                        s.send(token).ok();
-                    }
-                    ActorMessage::Unsubscribe(token, s) => {
-                        self.callbacks.remove(&token);
-                        s.send(()).ok();
-                    }
-                    ActorMessage::NetworkChange => {
-                        trace!("external network activity detected");
-                        last_event.replace(false);
-                        debounce_interval.reset_immediately();
+                msg = self.actor_receiver.recv() => {
+                    match msg {
+                        Some(ActorMessage::Subscribe(callback, s)) => {
+                            let token = self.next_callback_token();
+                            self.callbacks.insert(token, Arc::new(callback));
+                            s.send(token).ok();
+                        }
+                        Some(ActorMessage::Unsubscribe(token, s)) => {
+                            self.callbacks.remove(&token);
+                            s.send(()).ok();
+                        }
+                        Some(ActorMessage::NetworkChange) => {
+                            trace!("external network activity detected");
+                            last_event.replace(false);
+                            debounce_interval.reset_immediately();
+                        }
+                        None => {
+                            debug!("shutting down, actor receiver gone");
+                            break;
+                        }
                     }
-                },
-                else => {
-                    break;
                 }
             }
         }
-
-        Ok(())
     }
 
     fn next_callback_token(&mut self) -> CallbackToken {

net-tools/netwatch/src/netmon/bsd.rs

@@ -12,8 +12,7 @@ use crate::{interfaces::bsd::WireMessage, ip::is_link_local};
 
 #[derive(Debug)]
 pub(super) struct RouteMonitor {
-    #[allow(dead_code)]
-    handle: AbortOnDropHandle<()>,
+    _handle: AbortOnDropHandle<()>,
 }
 
 fn create_socket() -> Result<tokio::net::UnixStream> {
@@ -72,7 +71,7 @@ impl RouteMonitor {
         });
 
         Ok(RouteMonitor {
-            handle: AbortOnDropHandle::new(handle),
+            _handle: AbortOnDropHandle::new(handle),
         })
     }
 }