From 095917922567a18b37b137985d9750d236338e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 9 Apr 2022 16:14:44 +0200 Subject: [PATCH] Worker: redirect stderr to stdout at the right moment It should be done after stdout has been assigned a pipe, and not before. --- internal/worker/command_blender.go | 2 +- internal/worker/command_ffmpeg.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/worker/command_blender.go b/internal/worker/command_blender.go index cac9f797..bc492be3 100644 --- a/internal/worker/command_blender.go +++ b/internal/worker/command_blender.go @@ -39,11 +39,11 @@ func (ce *CommandExecutor) cmdBlenderRender(ctx context.Context, logger zerolog. return err } - execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout. outPipe, err := execCmd.StdoutPipe() if err != nil { return err } + execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout. if err := execCmd.Start(); err != nil { logger.Error().Err(err).Msg("error starting CLI execution") diff --git a/internal/worker/command_ffmpeg.go b/internal/worker/command_ffmpeg.go index 1a6a1226..f0465660 100644 --- a/internal/worker/command_ffmpeg.go +++ b/internal/worker/command_ffmpeg.go @@ -38,11 +38,11 @@ func (ce *CommandExecutor) cmdFramesToVideo(ctx context.Context, logger zerolog. } defer cleanup() - execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout. outPipe, err := execCmd.StdoutPipe() if err != nil { return err } + execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout. if err := execCmd.Start(); err != nil { logger.Error().Err(err).Msg("error starting CLI execution")