recompute stats_interval and read_timeout on config reload

Author: manio

src/io_uring.rs

@@ -96,6 +96,15 @@ async fn transfer_monitor(
     let mut report_time = Instant::now();
     let mut stall_check = Instant::now();
 
+    info!(
+        "{} ⚙️ Showing transfer statistics: <b><blue>{}</>",
+        NAME,
+        match stats_interval {
+            Some(d) => format_duration(d).to_string(),
+            None => "disabled".to_string(),
+        }
+    );
+
     loop {
         // load current total transfer from AtomicUsize:
         let usb_bytes_out = usb_bytes_written.load(Ordering::Relaxed);
@@ -198,10 +207,8 @@ async fn tcp_wait_for_connection(listener: &mut TcpListener) -> Result<TcpStream
 }
 
 pub async fn io_loop(
-    stats_interval: Option<Duration>,
     need_restart: Arc<Notify>,
     tcp_start: Arc<Notify>,
-    read_timeout: Duration,
     config: SharedConfig,
 ) -> Result<()> {
     // prepare/bind needed TCP listeners
@@ -213,6 +220,16 @@ pub async fn io_loop(
         // reload new config
         let config = config.read().await.clone();
 
+        // generate Durations from configured seconds
+        let stats_interval = {
+            if config.stats_interval == 0 {
+                None
+            } else {
+                Some(Duration::from_secs(config.stats_interval.into()))
+            }
+        };
+        let read_timeout = Duration::from_secs(config.timeout_secs.into());
+
         if !config.wired.is_some() && md_listener.is_none() {
             info!("{} 🛰️ Starting TCP server for MD...", NAME);
             let bind_addr = format!("0.0.0.0:{}", TCP_SERVER_PORT).parse().unwrap();

src/main.rs

@@ -304,15 +304,6 @@ fn main() {
     }
     debug!("{} ⚙️ startup configuration: {:#?}", NAME, config);
 
-    let stats_interval = {
-        if config.stats_interval == 0 {
-            None
-        } else {
-            Some(Duration::from_secs(config.stats_interval.into()))
-        }
-    };
-    let read_timeout = Duration::from_secs(config.timeout_secs.into());
-
     if let Some(ref wired) = config.wired {
         info!(
             "{} 🔌 enabled wired USB connection with {:04X?}",
@@ -324,14 +315,6 @@ fn main() {
         NAME,
         config.logfile.display()
     );
-    info!(
-        "{} ⚙️ Showing transfer statistics: <b><blue>{}</>",
-        NAME,
-        match stats_interval {
-            Some(d) => format_duration(d).to_string(),
-            None => "disabled".to_string(),
-        }
-    );
 
     // notify for syncing threads
     let need_restart = Arc::new(Notify::new());
@@ -348,13 +331,7 @@ fn main() {
     });
 
     // start tokio_uring runtime simultaneously
-    let _ = tokio_uring::start(io_loop(
-        stats_interval,
-        need_restart_cloned,
-        tcp_start_cloned,
-        read_timeout,
-        config,
-    ));
+    let _ = tokio_uring::start(io_loop(need_restart_cloned, tcp_start_cloned, config));
 
     info!(
         "🚩 aa-proxy-rs terminated, running time: {}",