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

Manager: fix race condition in logging of worker properties

Browse Source 
Dereferencing the `w *persistence.Worker` pointer should happen directly
in the function call, not in the zerolog callback function.
This commit is contained in:
Sybren A. Stüvel 2022-04-21 18:29:10 +02:00
parent bb1acef054
commit 79bac3a5f3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/manager/api_impl/worker_auth.go
View File

@ -65,12 +65,16 @@ func requestWorkerStore(e echo.Context, w *persistence.Worker) {
req := e.Request() req := e.Request()
reqCtx := context.WithValue(req.Context(), workerKey, w) reqCtx := context.WithValue(req.Context(), workerKey, w)
// Take copies now to avoid race conditions later.
wUUID := w.UUID
wName := w.Name
// Update the logger in this context to reflect the Worker. // Update the logger in this context to reflect the Worker.
l := zerolog.Ctx(reqCtx) l := zerolog.Ctx(reqCtx)
l.UpdateContext(func(c zerolog.Context) zerolog.Context { l.UpdateContext(func(c zerolog.Context) zerolog.Context {
return c. return c.
Str("wUUID", w.UUID). Str("wUUID", wUUID).
Str("wName", w.Name) Str("wName", wName)
}) })
e.SetRequest(req.WithContext(reqCtx)) e.SetRequest(req.WithContext(reqCtx))