docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error reporting on executor wait 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit c895a76f1076c782011e9decf58ab6548cf0fb35)
This commit is contained in:
Tonis Tiigi 2016-06-22 17:49:46 -07:00 committed by Tibor Vass
parent c2b195d3c2
commit e546ffb37a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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