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

Worker: improve warning when FFmpeg cannot be found

Browse Source 
On Linux (at least my Ubuntu) the error from finding FFmpeg wasn't
identified as a "file not found" error, and thus the more abstract
"unexpected error" message was logged.

Now any error with "file not found" in the message is handled as such,
and just produces a warning without the word "error" in there.
This commit is contained in:
Sybren A. Stüvel 2025-02-10 12:28:36 +01:00
parent e48fa4cc5f
commit fb65e55c98
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/flamenco-worker/find_exes.go
View File

@ -5,6 +5,7 @@ import (
"errors" "errors"
"io/fs" "io/fs"
"os/exec" "os/exec"
"strings"
"time" "time"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -18,10 +19,10 @@ import (
func findFFmpeg() { func findFFmpeg() {
result, err := find_ffmpeg.Find() result, err := find_ffmpeg.Find()
switch { switch {
case errors.Is(err, fs.ErrNotExist): case errors.Is(err, fs.ErrNotExist), strings.Contains(err.Error(), "file not found"):
log.Warn().Msg("FFmpeg could not be found on this system, render jobs may not run correctly") log.Warn().Msg("FFmpeg could not be found on this system, jobs may not run correctly")
case err != nil: case err != nil:
log.Warn().Err(err).Msg("there was an unexpected error finding FFmpeg on this system, render jobs may not run correctly") log.Warn().AnErr("cause", err).Msg("there was an unexpected error finding FFmpeg on this system, jobs may not run correctly")
default: default:
log.Info().Str("path", result.Path).Str("version", result.Version).Msg("FFmpeg found on this system") log.Info().Str("path", result.Path).Str("version", result.Version).Msg("FFmpeg found on this system")
} }