Config should fail if error, to prevent unexpected changes to distributions.

Various other fixes

Author: Jacob Halsey

src/config.rs

@@ -43,20 +43,27 @@ impl Config {
         fs::create_dir_all(&roaming_appdata).unwrap();
         let config_path = roaming_appdata.join("config.toml");
         if !config_path.exists() {
-            log::info!("Config file doesn't exist, creating default");
+            log::warn!("Config file doesn't exist, creating default");
             let new = Self::default();
             new.save(&config_path);
             return new;
         }
-        match fs::read_to_string(config_path) {
-            Ok(data) => match toml::from_str(&data) {
-                Ok(config) => return config,
-                Err(err) => log::error!("Unable to parse config file: {err}"),
-            },
-            Err(err) => log::error!("Unable to read config file: {err}"),
+        let contents = match fs::read_to_string(&config_path) {
+            Err(e) => panic!(
+                "Unable to read config file: {}: {}",
+                config_path.display(),
+                e
+            ),
+            Ok(s) => s,
+        };
+        match toml::from_str(&contents) {
+            Err(e) => panic!(
+                "Unable to parse config file: {}: {}",
+                config_path.display(),
+                e
+            ),
+            Ok(config) => config,
         }
-        log::warn!("Falling back to config defaults");
-        Self::default()
     }
 
     fn save(&self, path: &PathBuf) {

src/main.rs

@@ -78,7 +78,6 @@ unsafe extern "system" fn callback(
     _: *const MIB_IPFORWARD_ROW2,
     _: MIB_NOTIFICATION_TYPE,
 ) {
-    log::info!("NotifyRouteChange called");
     let tx = &*(callercontext as *const Sender<RunReason>);
     tx.send(RunReason::RouteChange).ok();
 }

src/runner.rs

@@ -37,11 +37,13 @@ pub fn start_runner(config: Config, rx: mpsc::Receiver<RunReason>, tray: TrayHan
             debounced += 1;
         }
         log::info!("Running due to {msg:?} message (and {debounced} debounced messages)");
-        if let Err(err) = update_dns(&config) {
-            log::error!("Error running: {err}");
-        }
-        if config.show_notifications {
-            tray.notify_dns_updated();
+        match update_dns(&config) {
+            Err(e) => log::error!("Error running: {e}"),
+            Ok(_) => {
+                if config.show_notifications {
+                    tray.notify_dns_updated();
+                }
+            }
         }
     });
 }
@@ -119,7 +121,7 @@ fn update_distribution(
     // https://github.com/microsoft/WSL/issues/6977
     distribution.set_read_only(RESOLV_CONF, false).ok();
     distribution.write_file(RESOLV_CONF, resolv)?;
-    distribution.set_read_only(RESOLV_CONF, true).ok();
+    distribution.set_read_only(RESOLV_CONF, true)?;
 
     // Optionally shutdown the WSL2 distribution once finished
     if config.shutdown && distribution.was_stopped() {