show running command on env LOG_LEVEL=debug

Author: light4

src/config.rs

@@ -8,7 +8,6 @@ use color_eyre::{
 };
 use directories::ProjectDirs;
 use kdl::KdlDocument;
-use tracing::debug;
 
 use crate::{Cli, PKG_NAME};
 
@@ -171,7 +170,7 @@ impl Config {
             iptables_prefix,
         };
 
-        debug!("CProxy config: {r:#?}");
+        tracing::info!("CProxy config: {r:#?}");
         Ok(r)
     }
 }

src/guards.rs

@@ -264,7 +264,7 @@ impl IpRuleGuard {
                         update_fwmark(&ipv6_cmd, Action::Add, &fwmark, &table);
                     }
                 }
-                if receiver.recv_timeout(Duration::from_secs(1)).is_ok() {
+                if receiver.recv_timeout(Duration::from_millis(500)).is_ok() {
                     break;
                 }
             }

src/iproute2.rs

@@ -8,7 +8,7 @@ use std::{
 
 use strum_macros::{EnumString, IntoStaticStr};
 
-use crate::errors::IPRoute2Error;
+use crate::{errors::IPRoute2Error, utils::command_to_string};
 
 pub type Result<T, E = IPRoute2Error> = core::result::Result<T, E>;
 
@@ -231,11 +231,11 @@ impl IPRoute2 {
         I: IntoIterator<Item = S>,
         S: AsRef<OsStr>,
     {
-        let output = self
-            .command()?
-            .args(args)
-            .output()
-            .expect("run ip command error");
+        let mut cmd = self.command()?;
+        cmd.args(args);
+
+        tracing::debug!("$ {}", &command_to_string(&cmd));
+        let output = cmd.output()?;
         if !output.status.success() {
             return Err(IPRoute2Error::from(output));
         }

src/iptables.rs

@@ -30,7 +30,7 @@ use lazy_regex::regex;
 use nix::fcntl::{flock, FlockArg};
 use semver::Version;
 
-use crate::errors::IptablesError;
+use crate::{errors::IptablesError, utils::command_to_string};
 
 // List of built-in chains taken from: man 8 iptables
 const BUILTIN_CHAINS_FILTER: &[&str] = &["INPUT", "FORWARD", "OUTPUT"];
@@ -479,7 +479,9 @@ impl IPTables {
         let output;
 
         if self.has_wait {
-            output = cmd.arg("--wait").output()?;
+            cmd.arg("--wait");
+            tracing::debug!("$ {}", &command_to_string(cmd));
+            output = cmd.output()?;
         } else {
             file_lock = Some(File::create("/var/run/xtables_old.lock")?);
 
@@ -499,6 +501,7 @@ impl IPTables {
                     }
                 }
             }
+            tracing::debug!("$ {}", &command_to_string(cmd));
             output = cmd.output()?;
         }
 

src/main.rs

@@ -11,6 +11,7 @@ mod guards;
 mod iproute2;
 mod iptables;
 mod proxy;
+mod utils;
 
 pub const PKG_NAME: &str = env!("CARGO_PKG_NAME");
 

src/utils.rs

@@ -0,0 +1,39 @@
+use std::process::Command;
+
+pub fn command_to_string(cmd: &Command) -> String {
+    let prog_env = cmd
+        .get_envs()
+        .map(|(k, v)| {
+            if let Some(value) = v {
+                format!("{}={}", k.to_string_lossy(), value.to_string_lossy())
+            } else {
+                format!("{}", k.to_string_lossy())
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(" ");
+    let prog_name = cmd.get_program().to_string_lossy();
+    let prog_args = cmd
+        .get_args()
+        .map(|i| {
+            let arg = i.to_string_lossy();
+            if arg.chars().any(|it| it.is_ascii_whitespace()) {
+                format!("\"{}\"", arg.escape_default())
+            } else {
+                arg.to_string()
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(" ");
+
+    let mut result = String::new();
+    if !prog_env.is_empty() {
+        result.push_str(&prog_env);
+        result.push(' ');
+    }
+    result.push_str(&prog_name);
+    result.push(' ');
+    result.push_str(&prog_args);
+
+    result
+}