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 /routers/web/repo/http.go | |
| 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 'routers/web/repo/http.go')
| -rw-r--r-- | routers/web/repo/http.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go index d1978aefe2..3aa8e84f57 100644 --- a/routers/web/repo/http.go +++ b/routers/web/repo/http.go @@ -8,7 +8,6 @@ package repo import ( "bytes" "compress/gzip" - gocontext "context" "fmt" "net/http" "os" @@ -485,8 +484,10 @@ func serviceRPC(h serviceHandler, service string) { h.environ = append(h.environ, "GIT_PROTOCOL="+protocol) } - ctx, cancel := gocontext.WithCancel(git.DefaultContext) - defer cancel() + // ctx, cancel := gocontext.WithCancel(git.DefaultContext) + ctx, _, finished := process.GetManager().AddContext(h.r.Context(), fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir)) + defer finished() + var stderr bytes.Buffer cmd := exec.CommandContext(ctx, git.GitExecutable, service, "--stateless-rpc", h.dir) cmd.Dir = h.dir @@ -495,9 +496,6 @@ func serviceRPC(h serviceHandler, service string) { cmd.Stdin = reqBody cmd.Stderr = &stderr - pid := process.GetManager().Add(fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir), cancel) - defer process.GetManager().Remove(pid) - if err := cmd.Run(); err != nil { log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String()) return |