From 5ac2975ec4d0c2fb508b29a135a12543fb087635 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 31 Jul 2020 20:34:54 -0700 Subject: [PATCH] Improve logs when running a command --- cmd/git-sync/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index 3d29303..965d0fe 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -742,7 +742,8 @@ func runCommand(ctx context.Context, cwd, command string, args ...string) (strin } func runCommandWithStdin(ctx context.Context, cwd, stdin, command string, args ...string) (string, error) { - log.V(5).Info("running command", "cwd", cwd, "cmd", cmdForLog(command, args...)) + cmdStr := cmdForLog(command, args...) + log.V(5).Info("running command", "cwd", cwd, "cmd", cmdStr) cmd := exec.CommandContext(ctx, command, args...) if cwd != "" { @@ -758,11 +759,12 @@ func runCommandWithStdin(ctx context.Context, cwd, stdin, command string, args . stdout := outbuf.String() stderr := errbuf.String() if ctx.Err() == context.DeadlineExceeded { - return "", fmt.Errorf("command timed out: %v: { stdout: %q, stderr: %q }", err, stdout, stderr) + return "", fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, ctx.Err(), stdout, stderr) } if err != nil { - return "", fmt.Errorf("error running command: %v: { stdout: %q, stderr: %q }", err, stdout, stderr) + return "", fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, err, stdout, stderr) } + log.V(6).Info("command result", "stdout", stdout, "stderr", stderr) return stdout, nil }