From 4cb9ee452378938fc9d5d4670cfb18d7d687341e Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Wed, 5 Jul 2023 11:40:40 -0400 Subject: [PATCH 1/2] point users to config help if worker cannot find blender exec --- cmd/flamenco-worker/find_exes.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/flamenco-worker/find_exes.go b/cmd/flamenco-worker/find_exes.go index f0ee0079..ba23572f 100644 --- a/cmd/flamenco-worker/find_exes.go +++ b/cmd/flamenco-worker/find_exes.go @@ -31,16 +31,20 @@ func findBlender() { ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() + helpMsg := "Flamenco Manager will have to supply the full path to Blender when Tasks are sent to this Worker. For more help see https://flamenco.blender.org/usage/variables/blender/" + result, err := find_blender.Find(ctx) switch { 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") + + log.Warn().Msg("The Worker could not find Blender on this system. " + helpMsg) + 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") + log.Warn().AnErr("cause", err).Msg("There was an error finding Blender on this system. " + helpMsg) default: log.Info(). Str("path", result.FoundLocation). Str("version", result.BlenderVersion). - Msg("Blender found on this system, it will be used unless Flamenco Manager specifies a path to a different Blender") + Msg("Blender found on this system, it will be used unless the Flamenco Manager configuration specifies a different path.") } } -- 2.30.2 From 31726a9224a1a9fb23adb1e21624c80df675fa7d Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Thu, 6 Jul 2023 15:04:29 +0200 Subject: [PATCH 2/2] PR fixes --- cmd/flamenco-worker/find_exes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/flamenco-worker/find_exes.go b/cmd/flamenco-worker/find_exes.go index ba23572f..0d047455 100644 --- a/cmd/flamenco-worker/find_exes.go +++ b/cmd/flamenco-worker/find_exes.go @@ -37,7 +37,7 @@ func findBlender() { switch { case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound): - log.Warn().Msg("The Worker could not find Blender on this system. " + helpMsg) + log.Warn().Msg("Blender could not be found. " + helpMsg) case err != nil: log.Warn().AnErr("cause", err).Msg("There was an error finding Blender on this system. " + helpMsg) -- 2.30.2