瀏覽代碼

Merge pull request #30764 from tiborvass/stacktrace-debug-mode

Show stacktrace in daemon logs only if 500 internal error
Alexander Morozov 8 年之前
父節點
當前提交
dc15fe8a34
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      api/server/server.go

+ 6 - 1
api/server/server.go

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