Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "buildbot: send sigterm instead of sigkill to child"

This commit is contained in:
mpl 2014-02-22 18:06:44 +00:00 committed by Gerrit Code Review
parent 593682dc2d 8f2c67241f
commit 831a81f2d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/buildbot/builder/builder.go
View File

@ -210,8 +210,8 @@ func (t *task) run() (string, error) {
t.Err = fmt.Sprintf("%v\n\nTask %q took too long. Giving up after %v seconds.\n",
t.Err, t.String(), *taskLifespan)
if cmd.Process != nil {
if err := cmd.Process.Kill(); err != nil {
dbg.Printf("Could not kill process for task %q: %v", t.String(), err)
if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
dbg.Printf("Could not terminate process for task %q: %v", t.String(), err)
}
}
return "", t