From 941699683534a35b4e3831aae101a2fdf26cade4 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 4 Apr 2016 11:55:17 -0700 Subject: [PATCH] api: fix pprof-address usage those handlers already added by init functions Signed-off-by: Alexander Morozov --- api/http/pprof/pprof.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/api/http/pprof/pprof.go b/api/http/pprof/pprof.go index 32c173a..5ed0c52 100644 --- a/api/http/pprof/pprof.go +++ b/api/http/pprof/pprof.go @@ -1,8 +1,7 @@ package pprof import ( - "expvar" - "fmt" + _ "expvar" "net/http" "net/http/pprof" @@ -12,11 +11,6 @@ import ( func Enable(address string) { http.Handle("/", http.RedirectHandler("/debug/pprof", http.StatusMovedPermanently)) - http.Handle("/debug/vars", http.HandlerFunc(expVars)) - http.Handle("/debug/pprof/", http.HandlerFunc(pprof.Index)) - http.Handle("/debug/pprof/cmdline", http.HandlerFunc(pprof.Cmdline)) - http.Handle("/debug/pprof/profile", http.HandlerFunc(pprof.Profile)) - http.Handle("/debug/pprof/symbol", http.HandlerFunc(pprof.Symbol)) http.Handle("/debug/pprof/block", pprof.Handler("block")) http.Handle("/debug/pprof/heap", pprof.Handler("heap")) http.Handle("/debug/pprof/goroutine", pprof.Handler("goroutine")) @@ -25,18 +19,3 @@ func Enable(address string) { go http.ListenAndServe(address, nil) logrus.Debug("pprof listening in address %s", address) } - -// Replicated from expvar.go as not public. -func expVars(w http.ResponseWriter, r *http.Request) { - first := true - w.Header().Set("Content-Type", "application/json; charset=utf-8") - fmt.Fprintf(w, "{\n") - expvar.Do(func(kv expvar.KeyValue) { - if !first { - fmt.Fprintf(w, ",\n") - } - first = false - fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value) - }) - fmt.Fprintf(w, "\n}\n") -}