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

enhance messages when blender is not found #104224

Closed
MichaelC wants to merge 6 commits from michael-2:wrn_blender_not_found_improvement into main
pull from: michael-2:wrn_blender_not_found_improvement
merge into: studio:main

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

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

@ -31,14 +31,16 @@ 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 {
Sybren A. Stüvel commented 2023-07-03 11:00:24 +02:00
Outdated
Review
Copy Link

I don't think this newline is necessary.

I don't think this newline is necessary.
case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound):
log.Warn().Msg(`The Worker could not find Blender on this system. 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/`)
log.Warn().Msg("The Worker could not find Blender on this system. " + helpMsg)
Sybren A. Stüvel commented 2023-07-03 11:01:59 +02:00
Review
Copy Link

The 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/ text can be extracted to a constant, so that it doesn't have to be repeated.

Also I don't think the backticks are necessary, regular double quotes should work equally well.

The `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/` text can be extracted to a constant, so that it doesn't have to be repeated. Also I don't think the backticks are necessary, regular double quotes should work equally well.
case err != nil:
log.Warn().AnErr("cause", err).Msg(`There was an error finding Blender on this system. 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/`)
log.Warn().AnErr("cause", err).Msg("There was an error finding Blender on this system. " + helpMsg)
default:
log.Info().
Str("path", result.FoundLocation).