📦 [agent v0.3.7] fix: cross compile

This commit is contained in:
naiba
2021-01-29 11:59:35 +08:00
parent 0f24c0d7ef
commit b5a0b0ff16
6 changed files with 57 additions and 88 deletions

View File

@@ -0,0 +1,31 @@
// +build !windows
package utils
import (
"os/exec"
"syscall"
)
type ProcessExitGroup struct {
cmds []*exec.Cmd
}
func NewProcessExitGroup() (ProcessExitGroup, error) {
return ProcessExitGroup{}, nil
}
func (g ProcessExitGroup) Dispose() error {
for _, c := range g.cmds {
if err := syscall.Kill(-c.Process.Pid, syscall.SIGKILL); err != nil {
return err
}
}
return nil
}
func (g *ProcessExitGroup) AddProcess(cmd *exec.Cmd) error {
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
g.cmds = append(g.cmds, cmd)
return nil
}

View File

@@ -1,20 +0,0 @@
package utils
import (
"errors"
"os"
)
type ProcessExitGroup struct{}
func NewProcessExitGroup() (ProcessExitGroup, error) {
return ProcessExitGroup{}, errors.New("not implement")
}
func (g ProcessExitGroup) Dispose() error {
return errors.New("not implement")
}
func (g ProcessExitGroup) AddProcess(p *os.Process) error {
return errors.New("not implement")
}

View File

@@ -1,20 +0,0 @@
package utils
import (
"errors"
"os"
)
type ProcessExitGroup struct{}
func NewProcessExitGroup() (ProcessExitGroup, error) {
return ProcessExitGroup{}, errors.New("not implement")
}
func (g ProcessExitGroup) Dispose() error {
return errors.New("not implement")
}
func (g ProcessExitGroup) AddProcess(p *os.Process) error {
return errors.New("not implement")
}

View File

@@ -1,7 +1,9 @@
// +build windows
package utils
import (
"os"
"os/exec"
"unsafe"
"golang.org/x/sys/windows"
@@ -42,8 +44,8 @@ func (g ProcessExitGroup) Dispose() error {
return windows.CloseHandle(windows.Handle(g))
}
func (g ProcessExitGroup) AddProcess(p *os.Process) error {
func (g ProcessExitGroup) AddProcess(cmd *exec.Cmd) error {
return windows.AssignProcessToJobObject(
windows.Handle(g),
windows.Handle((*process)(unsafe.Pointer(p)).Handle))
windows.Handle((*process)(unsafe.Pointer(cmd.Process)).Handle))
}