From af958676b81a40f91be9cea2c70062dd82b77af5 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 7 Jul 2023 02:00:30 +0200 Subject: [PATCH] Cleanup code Signed-off-by: Tim Vaillancourt --- http.go | 10 +++++----- main.go | 2 +- stats.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/http.go b/http.go index 873ddca..427974f 100644 --- a/http.go +++ b/http.go @@ -9,7 +9,9 @@ import ( "github.com/slackhq/nebula/config" ) -func startHttp(l *logrus.Logger, c *config.C, statsHandler statsHandlerFunc, listen string) (f func(), err error) { +// startHttp returns a function to start an http server with pprof support and optionally, a provided stats +// http handler. +func startHttp(l *logrus.Logger, c *config.C, listen string, statsHandler statsHandlerFunc) (func(), error) { if listen == "" { return nil, nil } @@ -22,13 +24,11 @@ func startHttp(l *logrus.Logger, c *config.C, statsHandler statsHandlerFunc, lis } } - f = func() { + return func() { l.Infof("Go pprof handler listening on %s at /debug/pprof", listen) if statsHandler != nil { http.Handle(statsPath, statsHandler(listen, statsPath)) } l.Fatal(http.ListenAndServe(listen, nil)) - } - - return f, err + }, nil } diff --git a/main.go b/main.go index ee2b8ed..e9a774d 100644 --- a/main.go +++ b/main.go @@ -338,7 +338,7 @@ func Main(c *config.C, configTest bool, buildVersion string, logger *logrus.Logg return nil, util.NewContextualError("Failed to start stats emitter", nil, err) } - httpStart, err := startHttp(l, c, statsHTTPHandler, httpListen) + httpStart, err := startHttp(l, c, httpListen, statsHTTPHandler) if err != nil { return nil, util.NewContextualError("Failed to start http server", nil, err) } diff --git a/stats.go b/stats.go index 5ec5c5c..a66a7fa 100644 --- a/stats.go +++ b/stats.go @@ -107,13 +107,13 @@ func startPrometheusStats(l *logrus.Logger, i time.Duration, c *config.C, listen pr.MustRegister(g) g.Set(1) - var f statsHandlerFunc + var startHandler statsHandlerFunc if !configTest { - f = func(listen, path string) http.Handler { + startHandler = func(listen, path string) http.Handler { l.Infof("Prometheus stats listening on %s at %s", listen, path) return promhttp.HandlerFor(pr, promhttp.HandlerOpts{ErrorLog: l}) } } - return f, nil + return startHandler, nil }