myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Move pprof to metrics router (#1902)

Browse source
This commit is contained in:
Juan Font 2024-04-21 22:08:59 +02:00 committed by GitHub
parent 9375b09206
commit bd047928f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hscontrol/app.go
View file

@ -453,7 +453,6 @@ func (h *Headscale) ensureUnixSocketIsAbsent() error {
func (h *Headscale) createRouter(grpcMux *grpcRuntime.ServeMux) *mux.Router { func (h *Headscale) createRouter(grpcMux *grpcRuntime.ServeMux) *mux.Router {
router := mux.NewRouter() router := mux.NewRouter()
router.Use(prometheusMiddleware) router.Use(prometheusMiddleware)
router.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler).Methods(http.MethodPost) router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler).Methods(http.MethodPost)
@ -681,7 +680,7 @@ func (h *Headscale) Serve() error {
// HTTP setup // HTTP setup
// //
// This is the regular router that we expose // This is the regular router that we expose
// over our main Addr. It also serves the legacy Tailcale API // over our main Addr
router := h.createRouter(grpcGatewayMux) router := h.createRouter(grpcGatewayMux)
httpServer := &http.Server{ httpServer := &http.Server{
@ -711,11 +710,10 @@ func (h *Headscale) Serve() error {
Msgf("listening and serving HTTP on: %s", h.cfg.Addr) Msgf("listening and serving HTTP on: %s", h.cfg.Addr)
debugMux := http.NewServeMux() debugMux := http.NewServeMux()
debugMux.Handle("/debug/pprof/", http.DefaultServeMux)
debugMux.HandleFunc("/debug/notifier", func(w http.ResponseWriter, r *http.Request) { debugMux.HandleFunc("/debug/notifier", func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.Write([]byte(h.nodeNotifier.String())) w.Write([]byte(h.nodeNotifier.String()))
return
}) })
debugMux.HandleFunc("/debug/mapresp", func(w http.ResponseWriter, r *http.Request) { debugMux.HandleFunc("/debug/mapresp", func(w http.ResponseWriter, r *http.Request) {
h.mapSessionMu.Lock() h.mapSessionMu.Lock()
@ -729,8 +727,6 @@ func (h *Headscale) Serve() error {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.Write([]byte(b.String())) w.Write([]byte(b.String()))
return
}) })
debugMux.Handle("/metrics", promhttp.Handler()) debugMux.Handle("/metrics", promhttp.Handler())