From 4902f047d3c6c37138a51bee05a3a48552619884 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 17 Jun 2014 16:07:34 -0400 Subject: [PATCH] adding a little uniqueness, to wrapped errors. Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) --- api/client/utils.go | 2 +- api/server/server.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/client/utils.go b/api/client/utils.go index 2620683708..13b5241d15 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -105,7 +105,7 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b 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: %s", bytes.TrimSpace(body)) + return nil, resp.StatusCode, fmt.Errorf("Error response from daemon: %s", bytes.TrimSpace(body)) } return resp.Body, resp.StatusCode, nil } diff --git a/api/server/server.go b/api/server/server.go index 61407b2648..ce1bdbd39e 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -398,7 +398,7 @@ func getContainersLogs(eng *engine.Engine, version version.Version, w http.Respo job.Stdout.Add(outStream) job.Stderr.Set(errStream) 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 } @@ -811,7 +811,7 @@ func postContainersAttach(eng *engine.Engine, version version.Version, w http.Re job.Stdout.Add(outStream) job.Stderr.Set(errStream) if err := job.Run(); err != nil { - fmt.Fprintf(outStream, "Error: %s\n", err) + fmt.Fprintf(outStream, "Error attaching: %s\n", err) } return nil @@ -841,7 +841,7 @@ func wsContainersAttach(eng *engine.Engine, version version.Version, w http.Resp job.Stdout.Add(ws) job.Stderr.Set(ws) if err := job.Run(); err != nil { - utils.Errorf("Error: %s", err) + utils.Errorf("Error attaching websocket: %s", err) } }) 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 { - utils.Errorf("Error: %s", err) + utils.Errorf("Error making handler: %s", err) httpError(w, err) } }