personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2025-11-11 02:53:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup code

Browse Source 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
This commit is contained in:
Tim Vaillancourt 2023-07-07 02:00:30 +02:00
parent 70779b26ad
commit af958676b8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
http.go
View File

@ -9,7 +9,9 @@ import (
"github.com/slackhq/nebula/config" "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 == "" { if listen == "" {
return nil, nil 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) l.Infof("Go pprof handler listening on %s at /debug/pprof", listen)
if statsHandler != nil { if statsHandler != nil {
http.Handle(statsPath, statsHandler(listen, statsPath)) http.Handle(statsPath, statsHandler(listen, statsPath))
} }
l.Fatal(http.ListenAndServe(listen, nil)) l.Fatal(http.ListenAndServe(listen, nil))
} }, nil
return f, err
} }

2
main.go
View File

@ -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) 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 { if err != nil {
return nil, util.NewContextualError("Failed to start http server", nil, err) return nil, util.NewContextualError("Failed to start http server", nil, err)
} }

6
stats.go
View File

@ -107,13 +107,13 @@ func startPrometheusStats(l *logrus.Logger, i time.Duration, c *config.C, listen
pr.MustRegister(g) pr.MustRegister(g)
g.Set(1) g.Set(1)
var f statsHandlerFunc var startHandler statsHandlerFunc
if !configTest { 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) l.Infof("Prometheus stats listening on %s at %s", listen, path)
return promhttp.HandlerFor(pr, promhttp.HandlerOpts{ErrorLog: l}) return promhttp.HandlerFor(pr, promhttp.HandlerOpts{ErrorLog: l})
} }
} }
return f, nil return startHandler, nil
} }