Merge pull request #48 from nulab/issue-46/safe-stop-running-child-pr…

…ocess Stop the running child process when the connection is broken (#46)
nulab · Sep 28, 2020 · b36c75f · b36c75f
2 parents 7dc706c + f656fd3
commit b36c75f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/githttpxfer/githttpxfer.go b/githttpxfer/githttpxfer.go
@@ -266,7 +266,11 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 	args := []string{rpc, "--stateless-rpc", "."}
 	cmd := ghx.Git.GitCommand(repoPath, args...)
 	cmd.Env = ctx.Env()
-	defer cleanUpProcessGroup(cmd)
+	defer cmd.Wait()
+	go func() {
+		<-req.Context().Done()
+		cleanUpProcessGroup(cmd)
+	}()
 
 	stdin, err := cmd.StdinPipe()
 	if err != nil {

diff --git a/githttpxfer/support.go b/githttpxfer/support.go
@@ -22,5 +22,4 @@ func cleanUpProcessGroup(cmd *exec.Cmd) {
 	if process := cmd.Process; process != nil && process.Pid > 0 {
 		syscall.Kill(-process.Pid, syscall.SIGTERM)
 	}
-	cmd.Wait()
 }