[agent v0.3.5] 🐛 fix: exec timeout

This commit is contained in:
naiba
2021-01-29 10:40:57 +08:00
parent 67230ee4b8
commit e439747c09
3 changed files with 39 additions and 22 deletions

View File

@@ -3,8 +3,8 @@ set -x
ME=`whoami`
ping example.com -c3 && \
ping example.com -c20 && \
echo "==== $ME ====" && \
ping example.net -c3 && \
ping example.net -c20 && \
echo $1 && \
echo "==== done! ===="

View File

@@ -8,6 +8,7 @@ import (
"net/http"
"os"
"os/exec"
"syscall"
"time"
"github.com/go-ping/ping"
@@ -85,7 +86,22 @@ func cmdExec() {
cmd = exec.Command("sh", "-c", execFrom+`/cmd/playground/example.sh hello && \
echo world!`)
}
output, err := cmd.Output()
log.Println("output:", string(output))
log.Println("err:", err)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
var endCh = make(chan struct{})
go func() {
output, err := cmd.Output()
log.Println("output:", string(output))
log.Println("err:", err)
close(endCh)
}()
go func() {
time.Sleep(time.Second * 2)
fmt.Println("killed")
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
panic(err)
}
}()
select {
case <-endCh:
}
}