diff options
| author | zeripath <art27@cantab.net> | 2020-07-01 14:01:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 14:01:17 +0100 |
| commit | 858c35b73184aa94242076d417ad09a74c55aebf (patch) | |
| tree | 50bed5c8733f461266f1a9a3984cad21ffaf35b6 /routers | |
| parent | 8f489131f32e45b0848475848c22405e8de6f5ff (diff) | |
| download | gitea-858c35b73184aa94242076d417ad09a74c55aebf.tar.gz gitea-858c35b73184aa94242076d417ad09a74c55aebf.zip | |
Ensure BlameReaders close at end of request (#12102)
#11716 reports multiple git blame processes hanging around
this was thought to be due to timeouts, however on closer look this
appears to be due to the Close() function of the BlameReader hanging
with a blocked stdout pipe.
This PR fixes this Close function to:
* Cancel the context of the cmd
* Close the StdoutReader - ensuring that the output pipe is closed
Further it makes the context of the `git blame` command a child of the
request context - ensuring that even if Close() is not called, on
cancellation of the Request the blame is command will also be cancelled.
Fixes #11716
Closes #11727
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/blame.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 9d4179abf7..69becc50d4 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -123,7 +123,7 @@ func RefBlame(ctx *context.Context) { return } - blameReader, err := git.CreateBlameReader(models.RepoPath(userName, repoName), commitID, fileName) + blameReader, err := git.CreateBlameReader(ctx.Req.Context(), models.RepoPath(userName, repoName), commitID, fileName) if err != nil { ctx.NotFound("CreateBlameReader", err) return |