Unverified Commit ca17c82b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #58865 from hzxuzhonghu/fix-filters-typos

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix some typos in apiserver filters **What this PR does / why we need it**: fix some typos **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents f96ac057 b9308355
...@@ -129,7 +129,7 @@ type baseTimeoutWriter struct { ...@@ -129,7 +129,7 @@ type baseTimeoutWriter struct {
w http.ResponseWriter w http.ResponseWriter
mu sync.Mutex mu sync.Mutex
// if the timeout handler has timedout // if the timeout handler has timeout
timedOut bool timedOut bool
// if this timeout writer has wrote header // if this timeout writer has wrote header
wroteHeader bool wroteHeader bool
......
...@@ -42,7 +42,7 @@ func WithWaitGroup(handler http.Handler, requestContextMapper apirequest.Request ...@@ -42,7 +42,7 @@ func WithWaitGroup(handler http.Handler, requestContextMapper apirequest.Request
if !longRunning(req, requestInfo) { if !longRunning(req, requestInfo) {
if err := wg.Add(1); err != nil { if err := wg.Add(1); err != nil {
http.Error(w, "Apisever is shutting down.", http.StatusInternalServerError) http.Error(w, "apiserver is shutting down.", http.StatusInternalServerError)
return return
} }
defer wg.Done() defer wg.Done()
......
...@@ -30,8 +30,8 @@ import ( ...@@ -30,8 +30,8 @@ import (
func WithPanicRecovery(handler http.Handler) http.Handler { func WithPanicRecovery(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
defer runtime.HandleCrash(func(err interface{}) { defer runtime.HandleCrash(func(err interface{}) {
http.Error(w, "This request caused apisever to panic. Look in log for details.", http.StatusInternalServerError) http.Error(w, "This request caused apiserver to panic. Look in the logs for details.", http.StatusInternalServerError)
glog.Errorf("APIServer panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, err, debug.Stack()) glog.Errorf("apiserver panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, err, debug.Stack())
}) })
logger := httplog.NewLogged(req, &w) logger := httplog.NewLogged(req, &w)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment