0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix error reporting on executor wait

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit c895a76f10)
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()
err := r.adapter.wait(ctx)
if err != nil {
return err
}
if ctx.Err() != nil {
return ctx.Err()
}
@ -166,6 +163,7 @@ func (r *controller) Wait(pctx context.Context) error {
if ec, ok := err.(exec.ExitCoder); ok {
ee.code = ec.ExitCode()
}
return ee
}
return nil
}