From 5cb0c9aa0d7eed087055b1efca79628957207d36 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 19 Jan 2022 23:26:57 +0000 Subject: Propagate context and ensure git commands run in request context (#17868) This PR continues the work in #17125 by progressively ensuring that git commands run within the request context. This now means that the if there is a git repo already open in the context it will be used instead of reopening it. Signed-off-by: Andrew Thornton --- models/db/context.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'models/db/context.go') diff --git a/models/db/context.go b/models/db/context.go index 55e38ba7e5..833c26ff6c 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -35,7 +35,7 @@ type Context struct { func WithEngine(ctx context.Context, e Engine) *Context { return &Context{ Context: ctx, - e: e, + e: e.Context(ctx), } } @@ -52,6 +52,11 @@ func (ctx *Context) Value(key interface{}) interface{} { return ctx.Context.Value(key) } +// WithContext returns this engine tied to this context +func (ctx *Context) WithContext(other context.Context) *Context { + return WithEngine(other, ctx.e) +} + // Engined structs provide an Engine type Engined interface { Engine() Engine -- cgit v1.2.3