From 759a94e49b21b32405237be978146a826dd53a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 22 Sep 2022 12:39:40 +0200 Subject: [PATCH] Blender finder: also handle `exec.ErrNotFound` as "expected" Blender not being found can be reported via various errors (this should be reworked in the 'blender finder API' at some point). `exec.ErrNotFound` is returned when Blender cannot be found on `$PATH`, which is something that's absolutely fine. This is now logged less dramatically. --- cmd/flamenco-worker/find_exes.go | 2 +- internal/manager/api_impl/meta.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/flamenco-worker/find_exes.go b/cmd/flamenco-worker/find_exes.go index ff090b88..f0ee0079 100644 --- a/cmd/flamenco-worker/find_exes.go +++ b/cmd/flamenco-worker/find_exes.go @@ -33,7 +33,7 @@ func findBlender() { result, err := find_blender.Find(ctx) switch { - case errors.Is(err, fs.ErrNotExist): + case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound): log.Warn().Msg("Blender could not be found, Flamenco Manager will have to supply a full path") case err != nil: log.Warn().AnErr("cause", err).Msg("there was an issue finding Blender on this system, Flamenco Manager will have to supply a full path") diff --git a/internal/manager/api_impl/meta.go b/internal/manager/api_impl/meta.go index 1e49357b..3e5188b8 100644 --- a/internal/manager/api_impl/meta.go +++ b/internal/manager/api_impl/meta.go @@ -181,7 +181,7 @@ func (f *Flamenco) FindBlenderExePath(e echo.Context) error { // executable and reports on the version of Blender. result, err := find_blender.CheckBlender(ctx, "") switch { - case errors.Is(err, fs.ErrNotExist): + case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound): logger.Info().Msg("Blender could not be found") case err != nil: logger.Warn().AnErr("cause", err).Msg("there was an issue finding Blender")