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 +12 -9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0dac4df945 - Show all commits

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

@ -34,13 +34,15 @@ func findBlender() {
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. 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/`)
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. 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/`)
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.")
} }
} }

7
web/project-website/content/usage/manager-configuration/_index.md
View File

@ -35,17 +35,18 @@ variables:
blender: blender:
values: values:
- platform: linux - platform: linux
value: blender value: /home/sybren/Downloads/blenders/blender-3.2.2-release/blender
- platform: windows - platform: windows
value: blender value: B:\Downloads\blenders\blender-3.2.2-release\blender.exe
- platform: darwin - platform: darwin
value: blender value: /home/sybren/Downloads/blenders/blender-3.2.2-release/blender
blenderArgs: blenderArgs:
values: values:
- platform: all - platform: all
value: -b -y value: -b -y
``` ```
## Creating a Configuration File
The usual way to create a configuration file is simply by starting Flamenco The usual way to create a configuration file is simply by starting Flamenco
Manager. If there is no config file yet, it will start the setup assistant to Manager. If there is no config file yet, it will start the setup assistant to
create one. If for any reasons the setup assistant is not usable for you, you create one. If for any reasons the setup assistant is not usable for you, you