From ca5a73ac6be8910a5c7e3a68df4e30c0e892cd36 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 17 Feb 2015 15:58:18 -0800 Subject: [PATCH] remove redundant func() --- pkg/apiserver/proxy.go | 2 +- pkg/apiserver/redirect.go | 2 +- pkg/apiserver/validator.go | 2 +- pkg/apiserver/watch.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go index 32f39c6edc7..dda1ff8526d 100644 --- a/pkg/apiserver/proxy.go +++ b/pkg/apiserver/proxy.go @@ -87,7 +87,7 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { var apiResource string var httpCode int reqStart := time.Now() - defer func() { monitor("proxy", verb, apiResource, httpCode, reqStart) }() + defer monitor("proxy", verb, apiResource, httpCode, reqStart) requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req) if err != nil { diff --git a/pkg/apiserver/redirect.go b/pkg/apiserver/redirect.go index f2451292d49..5267c4cd296 100644 --- a/pkg/apiserver/redirect.go +++ b/pkg/apiserver/redirect.go @@ -38,7 +38,7 @@ func (r *RedirectHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { var apiResource string var httpCode int reqStart := time.Now() - defer func() { monitor("redirect", verb, apiResource, httpCode, reqStart) }() + defer monitor("redirect", verb, apiResource, httpCode, reqStart) requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req) if err != nil { diff --git a/pkg/apiserver/validator.go b/pkg/apiserver/validator.go index 76b25a069ec..f4c2bf91046 100644 --- a/pkg/apiserver/validator.go +++ b/pkg/apiserver/validator.go @@ -75,7 +75,7 @@ type ServerStatus struct { func (v *validator) ServeHTTP(w http.ResponseWriter, r *http.Request) { var httpCode int reqStart := time.Now() - defer func() { monitor("validate", "get", "", httpCode, reqStart) }() + defer monitor("validate", "get", "", httpCode, reqStart) reply := []ServerStatus{} for name, server := range v.servers() { diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go index ae3178504d0..59d17cfff61 100644 --- a/pkg/apiserver/watch.go +++ b/pkg/apiserver/watch.go @@ -88,7 +88,7 @@ func (h *WatchHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { var apiResource string var httpCode int reqStart := time.Now() - defer func() { monitor("watch", verb, apiResource, httpCode, reqStart) }() + defer monitor("watch", verb, apiResource, httpCode, reqStart) if req.Method != "GET" { notFound(w, req)