[executor] Support separate stdout/stderr settings in all tasks

Author: teo

executor/executable/basictaskcommon.go

@@ -73,11 +73,16 @@ func (t *basicTaskBase) startBasicTask() (err error) {
 	var stdoutBuf, stderrBuf bytes.Buffer
 	var stdout, stderr io.Writer
 
-	if t.Tci.Log == nil {
+	if t.Tci.Stdout == nil {
 		none := "none"
-		t.Tci.Log = &none
+		t.Tci.Stdout = &none
 	}
-	switch *t.Tci.Log {
+	if t.Tci.Stderr == nil {
+		none := "none"
+		t.Tci.Stderr = &none
+	}
+
+	switch *t.Tci.Stdout {
 	case "stdout":
 		stdoutLog := log.WithPrefix("task-stdout").
 			WithField("level", infologger.IL_Support).
@@ -86,38 +91,49 @@ func (t *basicTaskBase) startBasicTask() (err error) {
 			WithField("task", t.ti.Name).
 			WithField("nohooks", true).
 			WriterLevel(logrus.TraceLevel)
-		stderrLog := log.WithPrefix("task-stderr").
+
+		// Each of these multiwriters will push incoming lines to a buffer as well as the logger
+		stdout = io.MultiWriter(stdoutLog, &stdoutBuf)
+
+	case "all":
+		stdoutLog := log.WithPrefix("task-stdout").
 			WithField("level", infologger.IL_Support).
 			WithField("partition", t.knownEnvironmentId.String()).
 			WithField("detector", t.knownDetector).
 			WithField("task", t.ti.Name).
-			WithField("nohooks", true).
 			WriterLevel(logrus.TraceLevel)
-
-		// Each of these multiwriters will push incoming lines to a buffer as well as the logger
 		stdout = io.MultiWriter(stdoutLog, &stdoutBuf)
-		stderr = io.MultiWriter(stderrLog, &stderrBuf)
 
-	case "all":
-		stdoutLog := log.WithPrefix("task-stdout").
+	default:
+		// Nothing goes to the log, we go straight to the buffer
+		stdout = &stdoutBuf
+	}
+
+	switch *t.Tci.Stderr {
+	case "stdout":
+		stderrLog := log.WithPrefix("task-stderr").
 			WithField("level", infologger.IL_Support).
 			WithField("partition", t.knownEnvironmentId.String()).
 			WithField("detector", t.knownDetector).
 			WithField("task", t.ti.Name).
+			WithField("nohooks", true).
 			WriterLevel(logrus.TraceLevel)
+
+		// Each of these multiwriters will push incoming lines to a buffer as well as the logger
+		stderr = io.MultiWriter(stderrLog, &stderrBuf)
+
+	case "all":
 		stderrLog := log.WithPrefix("task-stderr").
 			WithField("level", infologger.IL_Support).
 			WithField("partition", t.knownEnvironmentId.String()).
 			WithField("detector", t.knownDetector).
 			WithField("task", t.ti.Name).
 			WriterLevel(logrus.TraceLevel)
 
-		stdout = io.MultiWriter(stdoutLog, &stdoutBuf)
 		stderr = io.MultiWriter(stderrLog, &stderrBuf)
 
 	default:
 		// Nothing goes to the log, we go straight to the buffer
-		stdout = &stdoutBuf
 		stderr = &stderrBuf
 	}
 

executor/executable/controllabletask.go

@@ -168,11 +168,16 @@ func (t *ControllableTask) Launch() error {
 					"level":    infologger.IL_Devel,
 				}))
 
-		if t.Tci.Log == nil {
+		if t.Tci.Stdout == nil {
 			none := "none"
-			t.Tci.Log = &none
+			t.Tci.Stdout = &none
 		}
-		switch *t.Tci.Log {
+		if t.Tci.Stderr == nil {
+			none := "none"
+			t.Tci.Stderr = &none
+		}
+
+		switch *t.Tci.Stdout {
 		case "stdout":
 			go func() {
 				entry := log.WithPrefix("task-stdout").
@@ -188,34 +193,43 @@ func (t *ControllableTask) Launch() error {
 				_, errStdout = io.Copy(writer, stdoutIn)
 				writer.Flush()
 			}()
+		case "all":
 			go func() {
-				entry := log.WithPrefix("task-stderr").
+				entry := log.WithPrefix("task-stdout").
 					WithField("level", infologger.IL_Support).
 					WithField("partition", t.knownEnvironmentId.String()).
 					WithField("detector", t.knownDetector).
-					WithField("task", t.ti.Name).
-					WithField("nohooks", true)
+					WithField("task", t.ti.Name)
 				writer := &logger.SafeLogrusWriter{
 					Entry:     entry,
-					PrintFunc: entry.Warn,
+					PrintFunc: entry.Debug,
 				}
-				_, errStderr = io.Copy(writer, stderrIn)
+				_, errStdout = io.Copy(writer, stdoutIn)
 				writer.Flush()
 			}()
-		case "all":
+		default:
 			go func() {
-				entry := log.WithPrefix("task-stdout").
+				_, errStdout = io.Copy(io.Discard, stdoutIn)
+			}()
+		}
+
+		switch *t.Tci.Stderr {
+		case "stdout":
+			go func() {
+				entry := log.WithPrefix("task-stderr").
 					WithField("level", infologger.IL_Support).
 					WithField("partition", t.knownEnvironmentId.String()).
 					WithField("detector", t.knownDetector).
-					WithField("task", t.ti.Name)
+					WithField("task", t.ti.Name).
+					WithField("nohooks", true)
 				writer := &logger.SafeLogrusWriter{
 					Entry:     entry,
-					PrintFunc: entry.Debug,
+					PrintFunc: entry.Warn,
 				}
-				_, errStdout = io.Copy(writer, stdoutIn)
+				_, errStderr = io.Copy(writer, stderrIn)
 				writer.Flush()
 			}()
+		case "all":
 			go func() {
 				entry := log.WithPrefix("task-stderr").
 					WithField("level", infologger.IL_Support).
@@ -230,9 +244,6 @@ func (t *ControllableTask) Launch() error {
 				writer.Flush()
 			}()
 		default:
-			go func() {
-				_, errStdout = io.Copy(io.Discard, stdoutIn)
-			}()
 			go func() {
 				_, errStderr = io.Copy(io.Discard, stderrIn)
 			}()