Merge pull request #4507 from lavalamp/fix4

remove redundant func()
pull/6/head
Nikhil Jindal 2015-02-17 16:10:51 -08:00
commit a4bc22e263
4 changed files with 4 additions and 4 deletions

View File

@ -87,7 +87,7 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
var apiResource string var apiResource string
var httpCode int var httpCode int
reqStart := time.Now() reqStart := time.Now()
defer func() { monitor("proxy", verb, apiResource, httpCode, reqStart) }() defer monitor("proxy", verb, apiResource, httpCode, reqStart)
requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req) requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req)
if err != nil { if err != nil {

View File

@ -38,7 +38,7 @@ func (r *RedirectHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
var apiResource string var apiResource string
var httpCode int var httpCode int
reqStart := time.Now() reqStart := time.Now()
defer func() { monitor("redirect", verb, apiResource, httpCode, reqStart) }() defer monitor("redirect", verb, apiResource, httpCode, reqStart)
requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req) requestInfo, err := r.apiRequestInfoResolver.GetAPIRequestInfo(req)
if err != nil { if err != nil {

View File

@ -75,7 +75,7 @@ type ServerStatus struct {
func (v *validator) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (v *validator) ServeHTTP(w http.ResponseWriter, r *http.Request) {
var httpCode int var httpCode int
reqStart := time.Now() reqStart := time.Now()
defer func() { monitor("validate", "get", "", httpCode, reqStart) }() defer monitor("validate", "get", "", httpCode, reqStart)
reply := []ServerStatus{} reply := []ServerStatus{}
for name, server := range v.servers() { for name, server := range v.servers() {

View File

@ -88,7 +88,7 @@ func (h *WatchHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
var apiResource string var apiResource string
var httpCode int var httpCode int
reqStart := time.Now() reqStart := time.Now()
defer func() { monitor("watch", verb, apiResource, httpCode, reqStart) }() defer monitor("watch", verb, apiResource, httpCode, reqStart)
if req.Method != "GET" { if req.Method != "GET" {
notFound(w, req) notFound(w, req)