From a8c682fe99f6f4efbfd6f640870d956c814e26bf Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Tue, 20 Oct 2015 10:40:42 +0200
Subject: dump executor output directly to console when debug

Otherwise there is no way to see the output if executor hangs dead.
---
 ipc/ipc.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ipc')

diff --git a/ipc/ipc.go b/ipc/ipc.go
index bf5f38207..511398a7f 100644
--- a/ipc/ipc.go
+++ b/ipc/ipc.go
@@ -194,8 +194,13 @@ func (env *Env) execBin() (output, strace []byte, failed, hanged bool, err0 erro
 	cmd.ExtraFiles = append(cmd.ExtraFiles, env.inFile, env.outFile)
 	cmd.Env = []string{}
 	cmd.Dir = dir
-	cmd.Stdout = wp
-	cmd.Stderr = wp
+	if env.flags&FlagDebug == 0 {
+		cmd.Stdout = wp
+		cmd.Stderr = wp
+	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stdout
+	}
 	if syscall.Getuid() == 0 {
 		// Running under root, more isolation is possible.
 		cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Cloneflags: syscall.CLONE_NEWNS}
-- 
cgit mrf-deployment