Merge pull request #48445 from deads2k/server-28-panichandler

Automatic merge from submit-queue (batch tested with PRs 47162, 48444, 48445) make the panic handler first Move the panic handler to the beginning of the chain so that panics will get information in the log beyond a stack.

Merge pull request #48445 from deads2k/server-28-panichandler
fdee1d54 · Kubernetes Submit Queue · GitHub · cfde9e58 · 9b43bd4a · fdee1d54
Commit fdee1d54 authored Jul 05, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config.go staging/src/k8s.io/apiserver/pkg/server/config.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/config.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/config.go
@@ -476,11 +476,11 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler {
 	}
 	handler = genericapifilters.WithAuthentication(handler, c.RequestContextMapper, c.Authenticator, genericapifilters.Unauthorized(c.RequestContextMapper, c.Serializer, c.SupportsBasicAuth))
 	handler = genericfilters.WithCORS(handler, c.CorsAllowedOriginList, nil, nil, nil, "true")
-	handler = genericfilters.WithPanicRecovery(handler)
 	handler = genericfilters.WithTimeoutForNonLongRunningRequests(handler, c.RequestContextMapper, c.LongRunningFunc)
 	handler = genericfilters.WithMaxInFlightLimit(handler, c.MaxRequestsInFlight, c.MaxMutatingRequestsInFlight, c.RequestContextMapper, c.LongRunningFunc)
 	handler = genericapifilters.WithRequestInfo(handler, NewRequestInfoResolver(c), c.RequestContextMapper)
 	handler = apirequest.WithRequestContext(handler, c.RequestContextMapper)
+	handler = genericfilters.WithPanicRecovery(handler)
 	return handler
 }