From f5a0cddc88c2f341951e8798b46c522ec91a2ef0 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 18 Jun 2026 14:01:42 -0700
Subject: [PATCH] improve basic logging

---
 Cargo.lock                                |  1 +
 installer-gui/src-tauri/Cargo.toml        |  1 +
 installer-gui/src-tauri/src/introspect.rs | 20 ++++++++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 655896a..d642bbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2949,6 +2949,7 @@ dependencies = [
  "anyhow",
  "clap",
  "installer",
+ "log",
  "serde",
  "serde_json",
  "shlex",
diff --git a/installer-gui/src-tauri/Cargo.toml b/installer-gui/src-tauri/Cargo.toml
index 7742552..18064d7 100644
--- a/installer-gui/src-tauri/Cargo.toml
+++ b/installer-gui/src-tauri/Cargo.toml
@@ -24,3 +24,4 @@ serde_json = "1"
 anyhow = "1.0.100"
 shlex = "1"
 installer = { path = "../../installer" }
+log = "0.4.20"
diff --git a/installer-gui/src-tauri/src/introspect.rs b/installer-gui/src-tauri/src/introspect.rs
index 4313074..e7cfff9 100644
--- a/installer-gui/src-tauri/src/introspect.rs
+++ b/installer-gui/src-tauri/src/introspect.rs
@@ -26,10 +26,15 @@ impl Command<'_> {
             // by subcommand_modifiers()
             subcommands: modifiers::subcommand_modifiers()
                 .iter()
-                .filter_map(|modifier| {
-                    subcommand_map
-                        .get(modifier.command)
-                        .map(|subcommand| Subcommand::new(subcommand, modifier))
+                .filter_map(|modifier| match subcommand_map.get(modifier.command) {
+                    Some(clap_command) => Some(Subcommand::new(clap_command, modifier)),
+                    None => {
+                        error!(
+                            "failed to find clap command for subcommand {}",
+                            modifier.command
+                        );
+                        None
+                    }
                 })
                 .collect(),
         }
@@ -90,13 +95,16 @@ impl Subcommand<'_> {
                 .iter()
                 .filter_map(|arg_modifier| {
                     let Some(arg) = argument_map.get(arg_modifier.clap_id) else {
-                        error!("failed to get argument with id {arg_modifier.clap_id}");
+                        error!(
+                            "failed to find clap argument with id {}",
+                            arg_modifier.clap_id
+                        );
                         return None;
                     };
                     match Argument::try_new(arg, arg_modifier) {
                         Ok(modified_arg) => Some(modified_arg),
                         Err(err) => {
-                            error!("failed to modify arg: {err:?}");
+                            error!("failed to create modified argument: {:?}", err);
                             None
                         }
                     }