From b9308355a64c4138ac9558f790ed0f716f44c743 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Fri, 26 Jan 2018 16:43:22 +0800 Subject: [PATCH] fix some typos in filters --- staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go b/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go index 0e67da2529..e1ead0eeae 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go @@ -129,7 +129,7 @@ type baseTimeoutWriter struct { w http.ResponseWriter mu sync.Mutex - // if the timeout handler has timedout + // if the timeout handler has timeout timedOut bool // if this timeout writer has wrote header wroteHeader bool diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go b/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go index be73a2c9d9..c73978e20e 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go @@ -42,7 +42,7 @@ func WithWaitGroup(handler http.Handler, requestContextMapper apirequest.Request if !longRunning(req, requestInfo) { 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 } defer wg.Done() diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go b/staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go index f252fedd89..38742ffd9a 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go @@ -30,8 +30,8 @@ import ( func WithPanicRecovery(handler http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { defer runtime.HandleCrash(func(err interface{}) { - http.Error(w, "This request caused apisever to panic. Look in log for details.", http.StatusInternalServerError) - glog.Errorf("APIServer panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, err, debug.Stack()) + 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()) }) logger := httplog.NewLogged(req, &w)