1
0
mirror of https://github.com/moby/moby.git synced 2025-08-01 05:47:11 +03:00

Remove job from wait

Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca
2015-04-09 23:11:11 +02:00
parent bae3273ef4
commit db0ffba3b9
5 changed files with 49 additions and 89 deletions

View File

@ -1005,20 +1005,18 @@ func postContainersWait(eng *engine.Engine, version version.Version, w http.Resp
if vars == nil {
return fmt.Errorf("Missing parameter")
}
var (
stdoutBuffer = bytes.NewBuffer(nil)
job = eng.Job("wait", vars["name"])
)
job.Stdout.Add(stdoutBuffer)
if err := job.Run(); err != nil {
return err
}
statusCode, err := strconv.Atoi(engine.Tail(stdoutBuffer, 1))
name := vars["name"]
d := getDaemon(eng)
cont, err := d.Get(name)
if err != nil {
return err
}
status, _ := cont.WaitStop(-1 * time.Second)
return writeJSON(w, http.StatusOK, &types.ContainerWaitResponse{
StatusCode: statusCode,
StatusCode: status,
})
}