blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: include job UUID in "last-rendered image received" log entries

Browse Source 
This makes it possible to collect all "last-rendered image received"
entries for a single job.
This commit is contained in:
Sybren A. Stüvel 2022-07-19 18:40:22 +02:00
parent d929885b06
commit de80a09223
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/manager/api_impl/workers.go
View File

@ -404,6 +404,10 @@ func (f *Flamenco) TaskOutputProduced(e echo.Context, taskID string) error {
panic("task could not be fetched, but database gave no error either") panic("task could not be fetched, but database gave no error either")
} }
// Include the job UUID in the logger.
jobUUID := dbTask.Job.UUID
logger = logger.With().Str("job", jobUUID).Logger()
// Read the image bytes into memory. // Read the image bytes into memory.
imageBytes, err := io.ReadAll(e.Request().Body) imageBytes, err := io.ReadAll(e.Request().Body)
if err != nil { if err != nil {
@ -412,7 +416,6 @@ func (f *Flamenco) TaskOutputProduced(e echo.Context, taskID string) error {
} }
// Create the "last rendered" payload. // Create the "last rendered" payload.
jobUUID := dbTask.Job.UUID
thumbnailInfo, err := f.lastRenderedInfoForJob(logger, jobUUID) thumbnailInfo, err := f.lastRenderedInfoForJob(logger, jobUUID)
if err != nil { if err != nil {
logger.Error().Err(err).Msg("TaskOutputProduced: error getting last-rendered thumbnail info for job") logger.Error().Err(err).Msg("TaskOutputProduced: error getting last-rendered thumbnail info for job")
@ -426,7 +429,10 @@ func (f *Flamenco) TaskOutputProduced(e echo.Context, taskID string) error {
Callback: func(ctx context.Context) { Callback: func(ctx context.Context) {
// Store this job as the last one to get a rendered image. // Store this job as the last one to get a rendered image.
f.persist.SetLastRendered(ctx, dbTask.Job) err := f.persist.SetLastRendered(ctx, dbTask.Job)
if err != nil {
logger.Error().Err(err).Msg("TaskOutputProduced: error marking this job as the last one to receive render output")
}
// Broadcast when the processing is done. // Broadcast when the processing is done.
update := webupdates.NewLastRenderedUpdate(jobUUID) update := webupdates.NewLastRenderedUpdate(jobUUID)