From 1bc266dfa714f097cc9babf2f0c771566388d47b Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Wed, 25 Mar 2015 21:01:14 -0600 Subject: [PATCH 1/2] Changes response of postContainersWait to use a struct Signed-off-by: Nick Parker --- api/server/server.go | 11 +++++++---- api/types/types.go | 6 ++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 9c50bfb523..81dccb4ea4 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -877,7 +877,6 @@ func postContainersWait(eng *engine.Engine, version version.Version, w http.Resp return fmt.Errorf("Missing parameter") } var ( - env engine.Env stdoutBuffer = bytes.NewBuffer(nil) job = eng.Job("wait", vars["name"]) ) @@ -885,9 +884,13 @@ func postContainersWait(eng *engine.Engine, version version.Version, w http.Resp if err := job.Run(); err != nil { return err } - - env.Set("StatusCode", engine.Tail(stdoutBuffer, 1)) - return writeJSONEnv(w, http.StatusOK, env) + statusCode, err := strconv.Atoi(engine.Tail(stdoutBuffer, 1)) + if err != nil { + return err + } + return writeJSON(w, http.StatusOK, &types.ContainerWaitResponse{ + StatusCode: statusCode, + }) } func postContainersResize(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/api/types/types.go b/api/types/types.go index 21dba7729e..af21cd4f68 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -24,3 +24,9 @@ type AuthResponse struct { // Status is the authentication status Status string `json:"Status"` } + +// POST /auth +type ContainerWaitResponse struct { + // StatusCode is the status code of the wait job + StatusCode int `json:"StatusCode"` +} From 89d63d2a82e9a4c20696e9e93736a99a10be6c91 Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Wed, 25 Mar 2015 22:22:45 -0600 Subject: [PATCH 2/2] fixes comment for ContainerWaitResponse struct Signed-off-by: Nick Parker --- api/types/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/types/types.go b/api/types/types.go index af21cd4f68..50a72a550d 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -25,7 +25,7 @@ type AuthResponse struct { Status string `json:"Status"` } -// POST /auth +// POST "/containers/"+containerID+"/wait" type ContainerWaitResponse struct { // StatusCode is the status code of the wait job StatusCode int `json:"StatusCode"`