kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #3794 from vieux/fix_commands_error 

check for errors in call, not readBody
This commit is contained in:
Victor Vieux 2014-01-28 12:57:02 -08:00
parent 2723133a69 abbae8f764
commit fc697e3fd7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
commands.go
View File

@ -2319,6 +2319,18 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
}
return nil, -1, err
}
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, -1, err
}
if len(body) == 0 {
return nil, resp.StatusCode, fmt.Errorf("Error :%s", http.StatusText(resp.StatusCode))
}
return nil, resp.StatusCode, fmt.Errorf("Error: %s", bytes.TrimSpace(body))
}
wrapper := utils.NewReadCloserWrapper(resp.Body, func() error {
if resp != nil && resp.Body != nil {
resp.Body.Close()
@ -2598,12 +2610,6 @@ func readBody(stream io.ReadCloser, statusCode int, err error) ([]byte, int, err
if err != nil {
return nil, -1, err
}
if statusCode < 200 || statusCode >= 400 {
if len(body) == 0 {
return nil, statusCode, fmt.Errorf("Error: %s", http.StatusText(statusCode))
}
return nil, statusCode, fmt.Errorf("Error: %s", bytes.TrimSpace(body))
}
return body, statusCode, nil
}