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

Merge pull request #153 from tonistiigi/prefix-error

Browse source 
Add prefixes to external errors
This commit is contained in:
Kenfe-Mickaël Laventure 2016-03-22 21:06:41 -07:00
commit 0c1445dedf
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
runtime/container_linux.go
View file

@ -2,7 +2,6 @@ package runtime
import (
"encoding/json"
"errors"
"fmt"
"io"
"io/ioutil"
@ -329,7 +328,7 @@ func waitForStart(p *process, cmd *exec.Cmd) error {
}
for _, m := range messages {
if m.Level == "error" {
return errors.New(m.Msg)
return fmt.Errorf("shim error: %v", m.Msg)
}
}
// no errors reported back from shim, check for runc/runtime errors
@ -342,7 +341,7 @@ func waitForStart(p *process, cmd *exec.Cmd) error {
}
for _, m := range messages {
if m.Level == "error" {
return errors.New(m.Msg)
return fmt.Errorf("oci runtime error: %v", m.Msg)
}
}
return ErrContainerNotStarted