From 405ebf4b1e65fff81b45ed21b515a3e59e65eea0 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 21 Apr 2015 23:04:32 -0700 Subject: [PATCH] pkg/apiserver: use httpError in handlers.go --- pkg/apiserver/handlers.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/handlers.go b/pkg/apiserver/handlers.go index ab0d83e6d8d..cd20d35af8f 100644 --- a/pkg/apiserver/handlers.go +++ b/pkg/apiserver/handlers.go @@ -104,8 +104,7 @@ func RateLimit(rl util.RateLimiter, handler http.Handler) http.Handler { func tooManyRequests(w http.ResponseWriter) { // Return a 429 status indicating "Too Many Requests" w.Header().Set("Retry-After", RetryAfter) - w.WriteHeader(errors.StatusTooManyRequests) - fmt.Fprintf(w, "Too many requests, please try again later.") + http.Error(w, "Too many requests, please try again later.", errors.StatusTooManyRequests) } // RecoverPanics wraps an http Handler to recover and log panics. @@ -113,8 +112,7 @@ func RecoverPanics(handler http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { defer func() { if x := recover(); x != nil { - w.WriteHeader(http.StatusInternalServerError) - fmt.Fprint(w, "apis panic. Look in log for details.") + http.Error(w, "apis panic. Look in log for details.", http.StatusInternalServerError) glog.Infof("APIServer panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, x, debug.Stack()) } }()