diff options
Diffstat (limited to 'internal/cli')
| -rw-r--r-- | internal/cli/cli.go | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 4b3e36a..edf6048 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -123,12 +123,10 @@ func (a *App) Run() error { } if namespace.IsIsolated() { - fmt.Printf("DEBUG: IsIsolated=true, RuntimeBaseDir=%s\n", a.getPathManager().RuntimeBaseDir()) return a.ExecuteCommand(cfg) } pm := a.getPathManager() - fmt.Printf("DEBUG: IsIsolated=false, RuntimeBaseDir=%s\n", pm.RuntimeBaseDir()) // Preserve the host runtime base dir in the environment before bootstrapping _ = os.Setenv("WG_WRAP_HOST_RUNTIME_BASE_DIR", pm.RuntimeBaseDir()) @@ -146,7 +144,7 @@ func (a *App) Run() error { // Release the lock before executing the command to allow others to join namespace.ReleaseProfileLock(lockFile) - // Register this PID before joining to prevent the race where the joining process + // Register this PID before joining to prevent the race where the joining process // hasn't registered itself yet, causing the existing process to think it's the last one. _ = namespace.RegisterProcess(pm, cfg.Profile) @@ -163,6 +161,10 @@ func (a *App) Run() error { return nil } +func (a *App) isVerbose() bool { + return os.Getenv("WG_WRAP_VERBOSE") == "1" +} + func (a *App) ExecuteCommand(cfg *config.Config) error { if !namespace.IsIsolated() { return fmt.Errorf("ExecuteCommand called without namespace isolation") @@ -182,7 +184,7 @@ func (a *App) ExecuteCommand(cfg *config.Config) error { } if err := namespace.PruneStalePids(pm, cfg.Profile); err != nil { - fmt.Printf("failed to prune stale pids: %v\n", err) + fmt.Fprintf(os.Stderr, "failed to prune stale pids: %v\n", err) } if err := namespace.RegisterProcess(pm, cfg.Profile); err != nil { return fmt.Errorf("failed to register process: %w", err) @@ -203,20 +205,19 @@ func (a *App) ExecuteCommand(cfg *config.Config) error { if cleanupErr == nil { // 1. Unregister the process first. if err := namespace.UnregisterProcess(pm, cfg.Profile); err != nil { - fmt.Printf("failed to unregister process: %v\n", err) + fmt.Fprintf(os.Stderr, "failed to unregister process: %v\n", err) } // 2. Prune and check if we are the last process. if err := namespace.PruneStalePids(pm, cfg.Profile); err != nil { - fmt.Printf("failed to prune stale pids during cleanup: %v\n", err) + fmt.Fprintf(os.Stderr, "failed to prune stale pids during cleanup: %v\n", err) } last, lastErr := namespace.IsLastProcess(pm, cfg.Profile) if lastErr == nil && last { - fmt.Printf("Last process exiting. Cleaning up profile %s...\n", cfg.Profile) if err := namespace.UnpinNamespace(pm, cfg.Profile); err != nil { - fmt.Printf("failed to unpin namespace: %v\n", err) + fmt.Fprintf(os.Stderr, "failed to unpin namespace: %v\n", err) } } if lockErr == nil && !lockFileReleased { @@ -226,15 +227,19 @@ func (a *App) ExecuteCommand(cfg *config.Config) error { } else { // Fallback if lock fails to ensure we still unregister if err := namespace.UnregisterProcess(pm, cfg.Profile); err != nil { - fmt.Printf("failed to unregister process: %v\n", err) + fmt.Fprintf(os.Stderr, "failed to unregister process: %v\n", err) } } }() if os.Getenv("WG_WRAP_JOINED") == "1" { - fmt.Printf("Joining active WireGuard tunnel session for profile %s...\n", cfg.Profile) + if a.isVerbose() { + fmt.Printf("Joining active WireGuard tunnel session for profile %s...\n", cfg.Profile) + } } else { - fmt.Printf("Initializing WireGuard tunnel for profile %s...\n", cfg.Profile) + if a.isVerbose() { + fmt.Printf("Initializing WireGuard tunnel for profile %s...\n", cfg.Profile) + } // Parse the profile configuration profilesDir := pm.ConfigDir() @@ -268,7 +273,7 @@ func (a *App) ExecuteCommand(cfg *config.Config) error { } } if !hasDefaultRoute { - fmt.Printf("warning: Falling back to 1.1.1.1, but your profile does not route all traffic (0.0.0.0/0). DNS resolution may fail.\n") + fmt.Fprintf(os.Stderr, "warning: Falling back to 1.1.1.1, but your profile does not route all traffic (0.0.0.0/0). DNS resolution may fail.\n") } } @@ -280,14 +285,14 @@ func (a *App) ExecuteCommand(cfg *config.Config) error { // Pin the namespace so others can join it if err := namespace.PinNamespace(pm, cfg.Profile); err != nil { - fmt.Printf("warning: failed to pin namespace: %v\n", err) + fmt.Fprintf(os.Stderr, "warning: failed to pin namespace: %v\n", err) } } else { // If profile is not default or it was explicitly requested but doesn't exist, we error if cfg.Profile != "default" { return fmt.Errorf("profile %s not found: %w", cfg.Profile, err) } - fmt.Printf("warning: default profile configuration not found. Executing command in bare isolation.\n") + fmt.Fprintf(os.Stderr, "warning: default profile configuration not found. Executing command in bare isolation.\n") } } |