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

View File

@ -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("Blender could not be found. " + helpMsg)

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:
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.")
}
}