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

Merge pull request #172 from mlaventure/better-error-for-pause-and-resume

Browse Source 
Return the runtime error message on failed pause and resume calls
This commit is contained in:
Michael Crosby
2016-04-01 14:25:52 -07:00
parent bf20ebc4a0 fd888e8f34
commit cb3c208a4d
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/container_linux.go
View File

@@ -53,13 +53,21 @@ func (c *container) Runtime() string {
func (c *container) Pause() error {
args := c.runtimeArgs
args = append(args, "pause", c.id)
return exec.Command(c.runtime, args...).Run()
b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil {
return fmt.Errorf(string(b))
}
return nil
}
func (c *container) Resume() error {
args := c.runtimeArgs
args = append(args, "resume", c.id)
return exec.Command(c.runtime, args...).Run()
b, err := exec.Command(c.runtime, args...).CombinedOutput()
if err != nil {
return fmt.Errorf(string(b))
}
return nil
}
func (c *container) Checkpoints() ([]Checkpoint, error) {