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

Update wording for worker maintenance guidance on Flamenco Manager Console #104227

Closed
MichaelC wants to merge 11 commits from michael-2/flamenco:vue_worker_maintenance_wording into main
pull from: michael-2/flamenco:vue_worker_maintenance_wording
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 6 Commits 11 Files Changed 1 +3 -7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5359b713de - Show all commits

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

@ -31,20 +31,16 @@ 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)
case err != nil: case err != nil:
log.Warn().AnErr("cause", err).Msg("There was an error finding Blender on this system. " + helpMsg) log.Warn().AnErr("cause", err).Msg("there was an issue finding Blender on this system, Flamenco Manager will have to supply a full path")
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 the Flamenco Manager configuration specifies a different path.") Msg("Blender found on this system, it will be used unless Flamenco Manager specifies a path to a different Blender")
} }
} }