diff --git a/vendor/knative.dev/networking/test/test_images/runtime/handlers/handler.go b/vendor/knative.dev/networking/test/test_images/runtime/handlers/handler.go index 9c96b9eded..c56151f6af 100644 --- a/vendor/knative.dev/networking/test/test_images/runtime/handlers/handler.go +++ b/vendor/knative.dev/networking/test/test_images/runtime/handlers/handler.go @@ -30,14 +30,14 @@ import ( // InitHandlers initializes all handlers. func InitHandlers(mux *http.ServeMux) { - mux.HandleFunc("/", withHeaders(withRequestLog(runtimeHandler))) + mux.HandleFunc("/", withHeaders(runtimeHandler)) - h := probe.NewHandler(withRequestLog(withKubeletProbeHeaderCheck)) + h := probe.NewHandler(http.HandlerFunc(withKubeletProbeHeaderCheck)) mux.HandleFunc(nethttp.HealthCheckPath, h.ServeHTTP) } // withRequestLog logs each request before handling it. -func withRequestLog(next http.HandlerFunc) http.HandlerFunc { +func WithRequestLog(next http.HandlerFunc) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { reqDump, err := httputil.DumpRequest(r, true) if err != nil { @@ -73,6 +73,6 @@ func withHeaders(next http.HandlerFunc) http.HandlerFunc { func writeJSON(w http.ResponseWriter, o interface{}) { w.WriteHeader(http.StatusOK) e := json.NewEncoder(w) - e.SetIndent("", "\t") + // e.SetIndent("", "\t") e.Encode(o) } diff --git a/vendor/knative.dev/networking/test/test_images/runtime/main.go b/vendor/knative.dev/networking/test/test_images/runtime/main.go index b860e7ea75..c3b81eb6f3 100644 --- a/vendor/knative.dev/networking/test/test_images/runtime/main.go +++ b/vendor/knative.dev/networking/test/test_images/runtime/main.go @@ -48,11 +48,13 @@ func main() { mux := http.NewServeMux() handlers.InitHandlers(mux) + handler := handlers.WithRequestLog(mux.ServeHTTP) + if cert, key := os.Getenv("CERT"), os.Getenv("KEY"); cert != "" && key != "" { log.Print("Server starting on port with TLS ", port) - test.ListenAndServeTLSGracefullyWithHandler(cert, key, ":"+port, mux) + test.ListenAndServeTLSGracefullyWithHandler(cert, key, ":"+port, handler) } else { log.Print("Server starting on port ", port) - test.ListenAndServeGracefullyWithHandler(":"+port, mux) + test.ListenAndServeGracefullyWithHandler(":"+port, handler) } }