Fully redirecting stdout/err from Compile command

Author: cmaglie

Gopkg.lock

@@ -111,7 +111,7 @@ func run(cmd *cobra.Command, args []string) {
 		Quiet:           flags.quiet,
 		VidPid:          flags.vidPid,
 		ExportFile:      flags.exportFile,
-	}, os.Stdout, output.NewTaskProgressCB(), output.DownloadProgressBar())
+	}, os.Stdout, os.Stderr, output.NewTaskProgressCB(), output.DownloadProgressBar())
 	if err == nil {
 		outputCompileResp(compRes)
 	} else {

cli/compile/compile.go

@@ -24,7 +24,7 @@ import (
 )
 
 func Compile(ctx context.Context, req *rpc.CompileReq,
-	outStream io.Writer,
+	outStream io.Writer, errStream io.Writer,
 	taskCB commands.TaskProgressCB, downloadCB commands.DownloadProgressCB) (*rpc.CompileResp, error) {
 
 	pm := commands.GetPackageManager(req)
@@ -158,7 +158,9 @@ func Compile(ctx context.Context, req *rpc.CompileReq,
 		builderCtx.BuiltInLibrariesDirs = paths.NewPathList(ideLibrariesPath)
 	}
 
-	builderCtx.SetLogger(i18n.LoggerToIoWriter{Writer: outStream})
+	builderCtx.ExecStdout = outStream
+	builderCtx.ExecStderr = errStream
+	builderCtx.SetLogger(i18n.LoggerToCustomStreams{Stdout: outStream, Stderr: errStream})
 	if req.GetShowProperties() {
 		err = builder.RunParseHardwareAndDumpBuildProperties(builderCtx)
 	} else if req.GetPreprocess() {

commands/compile/compile.go

@@ -124,8 +124,11 @@ func main() {
 			fmt.Printf("Compile error: %s\n", err)
 			os.Exit(1)
 		}
-		if compResp.GetOutput() != nil {
-			fmt.Printf("%s", compResp.GetOutput())
+		if resp := compResp.GetOutStream(); resp != nil {
+			fmt.Printf(">> STDOUT: %s", resp)
+		}
+		if resperr := compResp.GetErrStream(); resperr != nil {
+			fmt.Printf(">> STDERR: %s", resperr)
 		}
 		if compResp.GetDownloadProgress() != nil {
 			fmt.Printf(">> DOWNLOAD: %s\n", compResp.GetDownloadProgress())
@@ -156,10 +159,10 @@ func main() {
 			os.Exit(1)
 		}
 		if resp := uplResp.GetOutStream(); resp != nil {
-			fmt.Printf("output %s", resp)
+			fmt.Printf(">> STDOUT: %s", resp)
 		}
 		if resperr := uplResp.GetErrStream(); resperr != nil {
-			fmt.Printf("error %s", resperr)
+			fmt.Printf(">> STDERR: %s", resperr)
 		}
 	}
 

daemon/client/client.go

@@ -59,7 +59,8 @@ func (s *ArduinoCoreServerImpl) Init(ctx context.Context, req *rpc.InitReq) (*rp
 func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCore_CompileServer) error {
 	resp, err := compile.Compile(
 		stream.Context(), req,
-		feedStream(func(data []byte) { stream.Send(&rpc.CompileResp{Output: data}) }),
+		feedStream(func(data []byte) { stream.Send(&rpc.CompileResp{OutStream: data}) }),
+		feedStream(func(data []byte) { stream.Send(&rpc.CompileResp{ErrStream: data}) }),
 		func(p *rpc.TaskProgress) { stream.Send(&rpc.CompileResp{TaskProgress: p}) },
 		func(p *rpc.DownloadProgress) { stream.Send(&rpc.CompileResp{DownloadProgress: p}) },
 	)

daemon/daemon.go

@@ -23,7 +23,8 @@ message CompileReq {
 }
 
 message CompileResp {
-  bytes output = 1;
-  DownloadProgress download_progress = 2;
-  TaskProgress task_progress = 3;
+  bytes out_stream = 1;
+  bytes err_stream = 2;
+  DownloadProgress download_progress = 3;
+  TaskProgress task_progress = 4;
 }