chore: refactor output buffer

uselagoon · Sep 29, 2023 · 09a5d03 · 09a5d03
1 parent 432d703
commit 09a5d03
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/internal/lagoon/tasks.go b/internal/lagoon/tasks.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"strconv"
 	"time"
@@ -267,12 +268,16 @@ func ExecTaskInPod(
 		return "", fmt.Errorf("error while creating Executor: %v", err)
 	}
 
-	var output bytes.Buffer
+	var stdOut, stdErr bytes.Buffer
 	err = exec.Stream(remotecommand.StreamOptions{
-		Stdout: &output,
-		Stderr: &output,
+		Stdout: &stdOut,
+		Stderr: &stdErr,
 		Tty:    tty,
 	})
+	buffers := []io.Reader{&stdOut, &stdErr}
+	var output bytes.Buffer
+	reader := io.MultiReader(buffers...)
+	output.ReadFrom(reader)
 	if err != nil {
 		return output.String(), fmt.Errorf("Error returned: %v", err)
 	}