studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

Flamenco Worker - Update WRN msg when Blender isn't found by Worker to help end user on next-steps #104230

Manually merged
Sybren A. Stüvel merged 2 commits from michael-2/flamenco:msg_blender_not_found into main 2023-07-10 15:09:44 +02:00
Conversation 0 Commits 2 Files Changed 1 +7 -3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4cb9ee4523 - Show all commits

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

@ -31,16 +31,20 @@ func findBlender() {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel() 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) result, err := find_blender.Find(ctx)
switch { switch {
case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound): 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)
Sybren A. Stüvel commented 2023-07-06 12:46:38 +02:00
Outdated
Review
Copy Link

Remove "The Worker" from the string. Everything logged by the worker is from the worker's perspective.

Remove "The Worker" from the string. Everything logged by the worker is from the worker's perspective.
case err != nil: 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: default:
log.Info(). log.Info().
Str("path", result.FoundLocation). Str("path", result.FoundLocation).
Str("version", result.BlenderVersion). 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.")
} }
} }