From b557acf9875ea4842babfe851ae6c6836c8256a1 Mon Sep 17 00:00:00 2001
From: Philibert Dugas <philibert.dugas@gmail.com>
Date: Thu, 22 Sep 2016 13:30:04 -0400
Subject: [PATCH] Update for the PR feedback

---
 pkg/apiserver/handlers.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/apiserver/handlers.go b/pkg/apiserver/handlers.go
index 316acd1cfd8..bcf29c49065 100644
--- a/pkg/apiserver/handlers.go
+++ b/pkg/apiserver/handlers.go
@@ -141,9 +141,10 @@ func RecoverPanics(handler http.Handler, resolver *RequestInfoResolver) http.Han
 			glog.Errorf("APIServer panic'd on %v %v: %v\n%s\n", req.Method, req.RequestURI, err, debug.Stack())
 		})
 
+		logger := httplog.NewLogged(req, &w)
 		requestInfo, err := resolver.GetRequestInfo(req)
 		if err != nil || requestInfo.Verb != "proxy" {
-			defer httplog.NewLogged(req, &w).StacktraceWhen(
+			logger.StacktraceWhen(
 				httplog.StatusIsNot(
 					http.StatusOK,
 					http.StatusCreated,
@@ -159,8 +160,9 @@ func RecoverPanics(handler http.Handler, resolver *RequestInfoResolver) http.Han
 					errors.StatusUnprocessableEntity,
 					http.StatusSwitchingProtocols,
 				),
-			).Log()
+			)
 		}
+		defer logger.Log()
 		// Dispatch to the internal handler
 		handler.ServeHTTP(w, req)
 	})