Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-03-22 02:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[agent v0.3.6] 🐛 fix: kill process group

Browse Source
This commit is contained in:
naiba
2021-01-29 11:11:39 +08:00
parent e439747c09
commit 0f24c0d7ef
6 changed files with 121 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/agent/main.go
View File

@@ -234,18 +234,32 @@ func doTask(task *pb.Task) {
startedAt := time.Now()
var cmd *exec.Cmd
var endCh = make(chan struct{})
var pg utils.ProcessExitGroup
timeout := time.NewTimer(time.Hour * 2)
if utils.IsWindows() {
var err error
pg, err = utils.NewProcessExitGroup()
if err != nil {
// Windows 进程组创建失败，直接退出
result.Data = err.Error()
client.ReportTask(ctx, &result)
return
}
cmd = exec.Command("cmd", "/c", task.GetData())
pg.AddProcess(cmd.Process)
} else {
cmd = exec.Command("sh", "-c", task.GetData())
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
}
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
go func() {
select {
case <-timeout.C:
result.Data = "任务执行超时\n"
cmd.Process.Kill()
if utils.IsWindows() {
pg.Dispose()
} else {
cmd.Process.Kill()
}
close(endCh)
case <-endCh:
}

18
cmd/playground/main.go
View File

@@ -80,13 +80,19 @@ func cmdExec() {
panic(err)
}
var cmd *exec.Cmd
var pg utils.ProcessExitGroup
if utils.IsWindows() {
pg, err = utils.NewProcessExitGroup()
if err != nil {
panic(err)
}
cmd = exec.Command("cmd", "/c", execFrom+"/cmd/playground/example.sh hello asd")
pg.AddProcess(cmd.Process)
} else {
cmd = exec.Command("sh", "-c", execFrom+`/cmd/playground/example.sh hello && \
echo world!`)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
}
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
var endCh = make(chan struct{})
go func() {
output, err := cmd.Output()
@@ -97,8 +103,14 @@ echo world!`)
go func() {
time.Sleep(time.Second * 2)
fmt.Println("killed")
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
panic(err)
if utils.IsWindows() {
if err := pg.Dispose(); err != nil {
panic(err)
}
} else {
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
panic(err)
}
}
}()
select {