ensure request context values are preserved when updating ctx

This commit is contained in:
kim 2024-04-05 22:46:35 +01:00
parent 4811ded078
commit 59ec876b57

View file

@ -24,6 +24,7 @@ import (
"codeberg.org/gruf/go-runners"
"codeberg.org/gruf/go-structr"
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
"github.com/superseriousbusiness/gotosocial/internal/httpclient"
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/queue"
@ -270,7 +271,8 @@ loop:
}
// Replace request context for worker state canceling.
dlv.Request.Request = dlv.Request.WithContext(ctx)
ctx := gtscontext.WithValues(ctx, dlv.Request.Context())
dlv.Request.Request = dlv.Request.Request.WithContext(ctx)
return dlv, true
}