toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4192 from crosbymichael/fix-404

Browse Source 
Fix error message only if no body is retuned
Upstream-commit: 045462a36742a7821dd277eb63fc61a840451424
Component: engine
This commit is contained in:
unclejack
2014-02-18 01:49:08 +02:00
parent e9b88ec705 cf7d93d809
commit 5806254d06
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/api/client.go
View File

@ -2080,15 +2080,13 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
return nil, -1, err
}
if resp.StatusCode == 404 {
return nil, resp.StatusCode, fmt.Errorf("Error: request for %s returned 404 Not Found for the api version", req.URL)
} else if resp.StatusCode < 200 || resp.StatusCode >= 400 {
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: request returned %s for api route and version %s, check if the server supports the requested api version", http.StatusText(resp.StatusCode), req.URL)
}
return nil, resp.StatusCode, fmt.Errorf("Error: %s", bytes.TrimSpace(body))
}