upstream/webhookd
1
0
Fork 0
mirror of https://github.com/ncarlier/webhookd.git synced 2025-04-12 10:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(script): kill script process and sub process on timeout

Browse Source
This commit is contained in:
Nicolas Carlier 2018-07-23 08:50:38 +00:00
parent eb699dd466
commit 92ef4e4054
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/worker/script_runner.go
View File

@ -7,6 +7,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path" "path"
"syscall"
"time" "time"
"github.com/ncarlier/webhookd/pkg/logger" "github.com/ncarlier/webhookd/pkg/logger"
@ -42,6 +43,8 @@ func runScript(work *WorkRequest) (string, error) {
cmd := exec.Command(binary, work.Payload) cmd := exec.Command(binary, work.Payload)
// with env variables... // with env variables...
cmd.Env = append(os.Environ(), work.Args...) cmd.Env = append(os.Environ(), work.Args...)
// using a process group...
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
// Open the out file for writing // Open the out file for writing
logFilename := path.Join(workingdir, fmt.Sprintf("%s_%s.txt", tools.ToSnakeCase(work.Name), time.Now().Format("20060102_1504"))) logFilename := path.Join(workingdir, fmt.Sprintf("%s_%s.txt", tools.ToSnakeCase(work.Name), time.Now().Format("20060102_1504")))
@ -90,7 +93,7 @@ func runScript(work *WorkRequest) (string, error) {
timer := time.AfterFunc(time.Duration(work.Timeout)*time.Second, func() { timer := time.AfterFunc(time.Duration(work.Timeout)*time.Second, func() {
logger.Warning.Printf("Timeout reached (%ds). Killing script: %s\n", work.Timeout, work.Script) logger.Warning.Printf("Timeout reached (%ds). Killing script: %s\n", work.Timeout, work.Script)
cmd.Process.Kill() syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
}) })
err = cmd.Wait() err = cmd.Wait()
if err != nil { if err != nil {