Merge pull request #39 from nulab/issue-5/clean-up-command-process

Issue 5/clean up command process

githttpxfer/git.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"syscall"
 )
 
 func newGit(rootPath string, binPath string, uploadPack bool, receivePack bool) *git {
@@ -59,6 +60,7 @@ func (g *git) UpdateServerInfo(repoPath string) ([]byte, error) {
 func (g *git) GitCommand(repoPath string, args ...string) *exec.Cmd {
 	command := exec.Command(g.binPath, args...)
 	command.Dir = g.GetAbsolutePath(repoPath)
+	command.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	return command
 }
 

githttpxfer/githttpxfer.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/exec"
 	"regexp"
 	"strings"
 	"sync"
@@ -265,6 +266,11 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 
 	args := []string{rpc, "--stateless-rpc", "."}
 	cmd := ghx.Git.GitCommand(repoPath, args...)
+	defer func(cmd *exec.Cmd) {
+		if err := cleanUpProcessGroup(cmd); err != nil {
+			ghx.logger.Error("clean up process group -> ", err.Error())
+		}
+	}(cmd)
 
 	stdin, err := cmd.StdinPipe()
 	if err != nil {

githttpxfer/support.go

@@ -2,7 +2,12 @@ package githttpxfer
 
 import (
 	"net/http"
+	"os/exec"
 	"strings"
+	"syscall"
+
+	"errors"
+	"fmt"
 )
 
 func getServiceType(req *http.Request) string {
@@ -12,3 +17,18 @@ func getServiceType(req *http.Request) string {
 	}
 	return strings.Replace(serviceType, "git-", "", 1)
 }
+
+func cleanUpProcessGroup(cmd *exec.Cmd) error {
+	if cmd == nil {
+		return errors.New("cmd is nil")
+	}
+	var err error
+	process := cmd.Process
+	if process != nil && process.Pid > 0 {
+		if e := syscall.Kill(-process.Pid, syscall.SIGTERM); e != nil {
+			err = fmt.Errorf(e.Error()+" [pgid %d]", -process.Pid)
+		}
+	}
+	cmd.Wait()
+	return err
+}