github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some typos in filters

Browse Source
This commit is contained in:
hzxuzhonghu
2018-01-26 16:43:22 +08:00
parent cd2692c49d
commit b9308355a6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
View File

@@ -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

2
staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go
View File

@@ -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()

4
staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go
View File

@@ -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)