github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #837 from mlaventure/fix-reaper-monitor

Browse Source 
Make reaper.Monitor returns an error when exit code is not 0
This commit is contained in:
Phil Estes
2017-05-12 16:34:25 -05:00
committed by GitHub
parent e0e06de707 ad59eee377
commit 7b2bf52f62
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
reaper/reaper.go
View File

@@ -9,6 +9,7 @@ import (
"sync" "sync"
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
"github.com/pkg/errors"
) )
// Reap should be called when the process receives an SIGCHLD. Reap will reap // Reap should be called when the process receives an SIGCHLD. Reap will reap
@@ -57,10 +58,8 @@ func (m *Monitor) CombinedOutput(c *exec.Cmd) ([]byte, error) {
var b bytes.Buffer var b bytes.Buffer
c.Stdout = &b c.Stdout = &b
c.Stderr = &b c.Stderr = &b
if err := m.Run(c); err != nil { err := m.Run(c)
return nil, err return b.Bytes(), err
}
return b.Bytes(), nil
} }
// Start starts the command a registers the process with the reaper // Start starts the command a registers the process with the reaper
@@ -111,7 +110,11 @@ func (m *Monitor) WaitPid(pid int) (int, error) {
if !ok { if !ok {
return 255, fmt.Errorf("process does not exist") return 255, fmt.Errorf("process does not exist")
} }
return <-rc.ExitCh, nil ec := <-rc.ExitCh
if ec != 0 {
return ec, errors.Errorf("exit status %d", ec)
}
return ec, nil
} }
type Cmd struct { type Cmd struct {