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

api: Don't include stack traces with errors

Browse Source 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7381fffb2f0a0307ef1575a299028d036f24088f
Component: engine
This commit is contained in:
Aaron Lehmann
2017-04-05 16:59:32 -07:00
parent ed86f7c60d
commit 75b06f1d80
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/server/server.go
View File

@ -139,11 +139,9 @@ func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc {
if err := handlerFunc(ctx, w, r, vars); err != nil {
statusCode := httputils.GetHTTPErrorStatusCode(err)
errFormat := "%v"
if statusCode == http.StatusInternalServerError {
errFormat = "%+v"
if statusCode >= 500 {
logrus.Errorf("Handler for %s %s returned error: %v", r.Method, r.URL.Path, err)
}
logrus.Errorf("Handler for %s %s returned error: "+errFormat, r.Method, r.URL.Path, err)
httputils.MakeErrorHandler(err)(w, r)
}
}