unistack-org/micro
3
0
Fork 3
Code Issues 16 Pull Requests 2 Actions Packages Projects Releases 239 Wiki Activity

kill all processes correctly for micro kill command (#1633)

Browse Source
This commit is contained in:
Dominic Wong 2020-05-13 18:36:45 +01:00 committed by GitHub
parent 09d1450d7d
commit 05858b746c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/default.go
View File

@ -536,7 +536,7 @@ func (r *runtime) Delete(s *Service, opts ...DeleteOption) error {
}
if s, ok := r.services[serviceKey(s)]; ok {
// check if running
if s.Running() {
if !s.Running() {
delete(r.services, s.key())
return nil
}

16
runtime/local/process/os/os.go
View File

@ -20,6 +20,7 @@ func (p *Process) Exec(exe *process.Executable) error {
}
func (p *Process) Fork(exe *process.Executable) (*process.PID, error) {
// create command
cmd := exec.Command(exe.Package.Path, exe.Args...)
@ -43,7 +44,6 @@ func (p *Process) Fork(exe *process.Executable) (*process.PID, error) {
if err != nil {
return nil, err
}
// start the process
if err := cmd.Start(); err != nil {
return nil, err
@ -62,22 +62,14 @@ func (p *Process) Kill(pid *process.PID) error {
if err != nil {
return err
}
pr, err := os.FindProcess(id)
if err != nil {
if _, err := os.FindProcess(id); err != nil {
return err
}
// now kill it
err = pr.Kill()
// using -ve PID kills the process group which we created in Fork()
return syscall.Kill(-id, syscall.SIGKILL)
// kill the group
if pgid, err := syscall.Getpgid(id); err == nil {
syscall.Kill(-pgid, syscall.SIGKILL)
}
// return the kill error
return err
}
func (p *Process) Wait(pid *process.PID) error {