rework debug printings

reconquest · Mar 13, 2019 · 65ac310 · 65ac310
1 parent 9f3a6b4
commit 65ac310
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/cmd/tubectl/kube.go b/cmd/tubectl/kube.go
@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
 	"sort"
@@ -43,9 +42,7 @@ func requestNamespaces(ctlPath string, params *Params) ([]string, error) {
 		"get", "namespaces", "-o", "json",
 	)
 
-	if debug {
-		log.Printf(":: %q", args)
-	}
+	debugcmd(args)
 
 	ctx := karma.Describe(
 		"cmdline",
@@ -85,9 +82,7 @@ func requestResources(ctlPath string, params *Params) ([]Resource, error) {
 		"get", params.Match.Resource, "-o", "json",
 	)
 
-	if debug {
-		log.Printf(":: %q", args)
-	}
+	debugcmd(args)
 
 	ctx := karma.Describe(
 		"cmdline",

diff --git a/cmd/tubectl/main.go b/cmd/tubectl/main.go
@@ -124,9 +124,7 @@ func syscallExec(ctlPath string, params *Params) {
 		args = append(args, arg)
 	}
 
-	if debug {
-		log.Printf(":: %q", args)
-	}
+	debugcmd(args)
 
 	syscall.Exec(
 		ctlPath,
@@ -191,3 +189,14 @@ func complete(items []string, query string) string {
 
 	return partial
 }
+
+func debugcmd(args []string) {
+	if debug {
+		values := []string{}
+		for _, arg := range args {
+			values = append(values, fmt.Sprintf("%q", arg))
+		}
+
+		log.Printf("%s", strings.Join(values, " "))
+	}
+}
diff --git a/cmd/tubectl/task.go b/cmd/tubectl/task.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"os/exec"
 	"sync"
@@ -77,9 +76,7 @@ func parallelize(tasks []Task) {
 }
 
 func run(ctlPath string, args []string, writer io.Writer) error {
-	if debug {
-		log.Printf(":: %q", append([]string{ctlPath}, args...))
-	}
+	debugcmd(append([]string{ctlPath}, args...))
 
 	cmd := exec.Command(ctlPath, args...)
 	cmd.Stdout = writer