vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Return errors from shim in log

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-17 14:37:26 -07:00
parent 366dcc08fa
commit 6ba5767b70
3 changed files with 50 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
runtime/container_linux.go
View file

@ -320,8 +320,18 @@ func waitForStart(p *process, cmd *exec.Cmd) error {
}
if !alive {
// runc could have failed to run the container so lets get the error
// out of the logs
messages, err := readLogMessages(filepath.Join(p.root, "log.json"))
// out of the logs or the shim could have encountered an error
messages, err := readLogMessages(filepath.Join(p.root, "shim-log.json"))
if err != nil {
return err
}
for _, m := range messages {
if m.Level == "error" {
return errors.New(m.Msg)
}
}
// no errors reported back from shim, check for runc/runtime errors
messages, err = readLogMessages(filepath.Join(p.root, "log.json"))
if err != nil {
if os.IsNotExist(err) {
return ErrContainerNotStarted