blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Worker: redirect stderr to stdout at the right moment

Browse Source 
It should be done after stdout has been assigned a pipe, and not before.
This commit is contained in:
Sybren A. Stüvel 2022-04-09 16:14:44 +02:00
parent 4181708709
commit 0959179225
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/worker/command_blender.go
View File

@ -39,11 +39,11 @@ func (ce *CommandExecutor) cmdBlenderRender(ctx context.Context, logger zerolog.
return err return err
} }
execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout.
outPipe, err := execCmd.StdoutPipe() outPipe, err := execCmd.StdoutPipe()
if err != nil { if err != nil {
return err return err
} }
execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout.
if err := execCmd.Start(); err != nil { if err := execCmd.Start(); err != nil {
logger.Error().Err(err).Msg("error starting CLI execution") logger.Error().Err(err).Msg("error starting CLI execution")

2
internal/worker/command_ffmpeg.go
View File

@ -38,11 +38,11 @@ func (ce *CommandExecutor) cmdFramesToVideo(ctx context.Context, logger zerolog.
} }
defer cleanup() defer cleanup()
execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout.
outPipe, err := execCmd.StdoutPipe() outPipe, err := execCmd.StdoutPipe()
if err != nil { if err != nil {
return err return err
} }
execCmd.Stderr = execCmd.Stdout // Redirect stderr to stdout.
if err := execCmd.Start(); err != nil { if err := execCmd.Start(); err != nil {
logger.Error().Err(err).Msg("error starting CLI execution") logger.Error().Err(err).Msg("error starting CLI execution")