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

Blender Finder: add timeout to blender --version invocation

Browse Source 
Make sure that the command execution doesn't hang indefinitely.
This commit is contained in:
Sybren A. Stüvel 2022-07-26 16:48:29 +02:00
parent 0c8409eb2e
commit 3f6dd9be8b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/find_blender/find_blender.go
View File

@ -8,6 +8,7 @@ import (
"fmt"
"os/exec"
"strings"
"time"
"git.blender.org/flamenco/pkg/api"
"git.blender.org/flamenco/pkg/crosspath"
@ -16,6 +17,11 @@ import (
var ErrNotAvailable = errors.New("not available on this platform")
// blenderVersionTimeout is how long `blender --version` is allowed to take,
// before timing out. This can be much slower than expected, when loading
// Blender from shared storage on a not-so-fast NAS.
const blenderVersionTimeout = 10 * time.Second
type CheckBlenderResult struct {
Input string // What was the original 'exename' CheckBlender was told to find.
FoundLocation string
@ -86,7 +92,11 @@ func getResultWithVersion(
func getBlenderVersion(ctx context.Context, commandline string) (string, error) {
logger := log.With().Str("commandline", commandline).Logger()
cmd := exec.CommandContext(ctx, commandline, "--version")
// Make sure that command execution doesn't hang indefinitely.
cmdCtx, cmdCtxCancel := context.WithTimeout(ctx, blenderVersionTimeout)
defer cmdCtxCancel()
cmd := exec.CommandContext(cmdCtx, commandline, "--version")
stdoutStderr, err := cmd.CombinedOutput()
if err != nil {
logger.Info().Err(err).Str("output", string(stdoutStderr)).Msg("error running command")