From 2ecae5d0362d89526dca32c3e52201ab7a77e673 Mon Sep 17 00:00:00 2001 From: Attila Tajti Date: Thu, 12 Feb 2015 19:29:06 +0100 Subject: [PATCH 1/2] fix printing % characters from client --- runner/logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runner/logger.go b/runner/logger.go index 4ccc0c3..5f5b781 100644 --- a/runner/logger.go +++ b/runner/logger.go @@ -34,7 +34,7 @@ func fatal(err error) { type appLogWriter struct{} func (a appLogWriter) Write(p []byte) (n int, err error) { - appLog(string(p)) + appLog("%s", string(p)) return len(p), nil } From c8840e0715d97def61900dd24bd01e62fb68c74a Mon Sep 17 00:00:00 2001 From: Attila Tajti Date: Thu, 12 Feb 2015 19:31:07 +0100 Subject: [PATCH 2/2] remove unnecessary pipe code --- runner/runner.go | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/runner/runner.go b/runner/runner.go index f15f89a..7326cf6 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -1,7 +1,6 @@ package runner import ( - "io" "os/exec" ) @@ -10,24 +9,14 @@ func run() bool { cmd := exec.Command(buildPath()) - stderr, err := cmd.StderrPipe() - if err != nil { - fatal(err) - } - - stdout, err := cmd.StdoutPipe() - if err != nil { - fatal(err) - } + cmd.Stdout = appLogWriter{} + cmd.Stderr = appLogWriter{} - err = cmd.Start() + err := cmd.Start() if err != nil { fatal(err) } - go io.Copy(appLogWriter{}, stderr) - go io.Copy(appLogWriter{}, stdout) - go func() { <-stopChannel pid := cmd.Process.Pid