From 6ffbbad21790ccf1f1f7063a0800a4696a572c76 Mon Sep 17 00:00:00 2001 From: Shyam Jeedigunta Date: Wed, 12 Jul 2017 17:29:26 +0200 Subject: [PATCH] maxinflight handler should let panicrecovery handler call NewLogged --- .../src/k8s.io/apiserver/pkg/server/filters/maxinflight.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go index 6a1f4da0783..346d7fbdac9 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go @@ -27,7 +27,6 @@ import ( "k8s.io/apiserver/pkg/endpoints/metrics" apirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/apiserver/pkg/server/httplog" "github.com/golang/glog" ) @@ -105,10 +104,6 @@ func WithMaxInFlightLimit( } func tooManyRequests(req *http.Request, w http.ResponseWriter) { - // "Too Many Requests" response is returned before logger is setup for the request. - // So we need to explicitly log it here. - defer httplog.NewLogged(req, &w).Log() - // Return a 429 status indicating "Too Many Requests" w.Header().Set("Retry-After", retryAfter) http.Error(w, "Too many requests, please try again later.", errors.StatusTooManyRequests)