diff options
| author | zeripath <art27@cantab.net> | 2021-11-30 20:06:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 20:06:32 +0000 |
| commit | 01087e9eef21ff5ea1cebbb1e84933954671fdf2 (patch) | |
| tree | ae618785a3bd46e012096683e2fd2309f87c571d /modules/markup | |
| parent | d894c90b703ce215e2319ae2e2bf95989f77805d (diff) | |
| download | gitea-01087e9eef21ff5ea1cebbb1e84933954671fdf2.tar.gz gitea-01087e9eef21ff5ea1cebbb1e84933954671fdf2.zip | |
Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125)
This PR registers requests with the process manager and manages hierarchy within the processes.
Git repos are then associated with a context, (usually the request's context) - with sub commands using this context as their base context.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/markup')
| -rw-r--r-- | modules/markup/external/external.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 36cbd69f92..3acb601067 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -5,7 +5,6 @@ package external import ( - "context" "fmt" "io" "os" @@ -107,11 +106,8 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io. ctx.Ctx = graceful.GetManager().ShutdownContext() } - processCtx, cancel := context.WithCancel(ctx.Ctx) - defer cancel() - - pid := process.GetManager().Add(fmt.Sprintf("Render [%s] for %s", commands[0], ctx.URLPrefix), cancel) - defer process.GetManager().Remove(pid) + processCtx, _, finished := process.GetManager().AddContext(ctx.Ctx, fmt.Sprintf("Render [%s] for %s", commands[0], ctx.URLPrefix)) + defer finished() cmd := exec.CommandContext(processCtx, commands[0], args...) cmd.Env = append( |