docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6487 from vbatts/vbatts-error_info 

adding a little uniqueness, to wrapped errors.
This commit is contained in:
Tibor Vass 2014-06-18 11:43:59 -04:00
parent 4195fc0494 4902f047d3
commit 331ae9c0f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/client/utils.go
View File

@ -105,7 +105,7 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
if len(body) == 0 { if len(body) == 0 {
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: 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)) return nil, resp.StatusCode, fmt.Errorf("Error response from daemon: %s", bytes.TrimSpace(body))
} }
return resp.Body, resp.StatusCode, nil return resp.Body, resp.StatusCode, nil
} }

8
api/server/server.go
View File

@ -398,7 +398,7 @@ func getContainersLogs(eng *engine.Engine, version version.Version, w http.Respo
job.Stdout.Add(outStream) job.Stdout.Add(outStream)
job.Stderr.Set(errStream) job.Stderr.Set(errStream)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
fmt.Fprintf(outStream, "Error: %s\n", err) fmt.Fprintf(outStream, "Error running logs job: %s\n", err)
} }
return nil return nil
} }
@ -811,7 +811,7 @@ func postContainersAttach(eng *engine.Engine, version version.Version, w http.Re
job.Stdout.Add(outStream) job.Stdout.Add(outStream)
job.Stderr.Set(errStream) job.Stderr.Set(errStream)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
fmt.Fprintf(outStream, "Error: %s\n", err) fmt.Fprintf(outStream, "Error attaching: %s\n", err)
} }
return nil return nil
@ -841,7 +841,7 @@ func wsContainersAttach(eng *engine.Engine, version version.Version, w http.Resp
job.Stdout.Add(ws) job.Stdout.Add(ws)
job.Stderr.Set(ws) job.Stderr.Set(ws)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
utils.Errorf("Error: %s", err) utils.Errorf("Error attaching websocket: %s", err)
} }
}) })
h.ServeHTTP(w, r) h.ServeHTTP(w, r)
@ -1022,7 +1022,7 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local
} }
if err := handlerFunc(eng, version, w, r, mux.Vars(r)); err != nil { if err := handlerFunc(eng, version, w, r, mux.Vars(r)); err != nil {
utils.Errorf("Error: %s", err) utils.Errorf("Error making handler: %s", err)
httpError(w, err) httpError(w, err)
} }
} }