TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 11:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tsweb: update ServeMux matching to 1.22.0 syntax (#11090)" (#11125)

Browse Source 
This reverts commit 30c9189ed3.

Signed-off-by: Patrick O'Doherty <patrick@tailscale.com>
This commit is contained in:
Patrick O'Doherty 2024-02-13 10:49:36 -08:00 committed by GitHub
parent f7acbefbbb
commit 256ecd0e8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tsweb/debug.go
View File

@ -39,20 +39,20 @@ type DebugHandler struct {
// Debugger returns the DebugHandler registered on mux at /debug/, // Debugger returns the DebugHandler registered on mux at /debug/,
// creating it if necessary. // creating it if necessary.
func Debugger(mux *http.ServeMux) *DebugHandler { func Debugger(mux *http.ServeMux) *DebugHandler {
h, pattern := mux.Handler(&http.Request{Method: "GET", URL: &url.URL{Path: "/debug/"}}) h, pat := mux.Handler(&http.Request{URL: &url.URL{Path: "/debug/"}})
if d, ok := h.(*DebugHandler); ok && pattern == "GET /debug/" { if d, ok := h.(*DebugHandler); ok && pat == "/debug/" {
return d return d
} }
ret := &DebugHandler{ ret := &DebugHandler{
mux: mux, mux: mux,
} }
mux.Handle("GET /debug/", ret) mux.Handle("/debug/", ret)
ret.KVFunc("Uptime", func() any { return varz.Uptime() }) ret.KVFunc("Uptime", func() any { return varz.Uptime() })
ret.KV("Version", version.Long()) ret.KV("Version", version.Long())
ret.Handle("GET vars", "Metrics (Go)", expvar.Handler()) ret.Handle("vars", "Metrics (Go)", expvar.Handler())
ret.Handle("GET varz", "Metrics (Prometheus)", http.HandlerFunc(promvarz.Handler)) ret.Handle("varz", "Metrics (Prometheus)", http.HandlerFunc(promvarz.Handler))
ret.Handle("GET pprof/", "pprof (index)", http.HandlerFunc(pprof.Index)) ret.Handle("pprof/", "pprof (index)", http.HandlerFunc(pprof.Index))
// the CPU profile handler is special because it responds // the CPU profile handler is special because it responds
// streamily, unlike every other pprof handler. This means it's // streamily, unlike every other pprof handler. This means it's
// not made available through pprof.Index the way all the other // not made available through pprof.Index the way all the other
@ -63,7 +63,7 @@ func Debugger(mux *http.ServeMux) *DebugHandler {
ret.HandleSilent("pprof/profile", http.HandlerFunc(pprof.Profile)) ret.HandleSilent("pprof/profile", http.HandlerFunc(pprof.Profile))
ret.URL("/debug/pprof/goroutine?debug=1", "Goroutines (collapsed)") ret.URL("/debug/pprof/goroutine?debug=1", "Goroutines (collapsed)")
ret.URL("/debug/pprof/goroutine?debug=2", "Goroutines (full)") ret.URL("/debug/pprof/goroutine?debug=2", "Goroutines (full)")
ret.Handle("GET gc", "force GC", http.HandlerFunc(gcHandler)) ret.Handle("gc", "force GC", http.HandlerFunc(gcHandler))
hostname, err := os.Hostname() hostname, err := os.Hostname()
if err == nil { if err == nil {
ret.KV("Machine", hostname) ret.KV("Machine", hostname)
@ -98,7 +98,7 @@ func (d *DebugHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
func (d *DebugHandler) handle(slug string, handler http.Handler) string { func (d *DebugHandler) handle(slug string, handler http.Handler) string {
href := "GET /debug/" + slug href := "/debug/" + slug
d.mux.Handle(href, Protected(debugBrowserHeaderHandler(handler))) d.mux.Handle(href, Protected(debugBrowserHeaderHandler(handler)))
return href return href
} }