kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #23881 from tonistiigi/exec-wait

Browse source 
Fix error reporting on executor wait
This commit is contained in:
Brian Goff 2016-06-24 11:18:49 -04:00 • committed by GitHub
commit e82dcf1c6d
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/cluster/executor/container/controller.go
View file

@ -155,9 +155,6 @@ func (r *controller) Wait(pctx context.Context) error {
defer cancel()
err := r.adapter.wait(ctx)
if err != nil {
return err
}
if ctx.Err() != nil {
return ctx.Err()
}
@ -169,6 +166,7 @@ func (r *controller) Wait(pctx context.Context) error {
if ec, ok := err.(exec.ExitCoder); ok {
ee.code = ec.ExitCode()
}
return ee
}
return nil
}