TrueCloudLab/distribution
14
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #3895 from pluralsh/bug-fix-5001-server-rebase

Browse source 
Fix the issue that the debug server with port 5001 run twice
This commit is contained in:
Wang Yan 2023-05-05 13:21:55 +08:00 committed by GitHub
commit 8900e90699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
registry/registry.go
View file

@ -100,29 +100,12 @@ var ServeCmd = &cobra.Command{
cmd.Usage() cmd.Usage()
os.Exit(1) os.Exit(1)
} }
if config.HTTP.Debug.Addr != "" {
go func(addr string) {
logrus.Infof("debug server listening %v", addr)
if err := http.ListenAndServe(addr, nil); err != nil {
logrus.Fatalf("error listening on debug interface: %v", err)
}
}(config.HTTP.Debug.Addr)
}
registry, err := NewRegistry(ctx, config) registry, err := NewRegistry(ctx, config)
if err != nil { if err != nil {
logrus.Fatalln(err) logrus.Fatalln(err)
} }
if config.HTTP.Debug.Prometheus.Enabled { configureDebugServer(config)
path := config.HTTP.Debug.Prometheus.Path
if path == "" {
path = "/metrics"
}
logrus.Info("providing prometheus metrics on ", path)
http.Handle(path, metrics.Handler())
}
if err = registry.ListenAndServe(); err != nil { if err = registry.ListenAndServe(); err != nil {
logrus.Fatalln(err) logrus.Fatalln(err)
@ -318,6 +301,29 @@ func (registry *Registry) ListenAndServe() error {
} }
} }
func configureDebugServer(config *configuration.Configuration) {
if config.HTTP.Debug.Addr != "" {
go func(addr string) {
logrus.Infof("debug server listening %v", addr)
if err := http.ListenAndServe(addr, nil); err != nil {
logrus.Fatalf("error listening on debug interface: %v", err)
}
}(config.HTTP.Debug.Addr)
configurePrometheus(config)
}
}
func configurePrometheus(config *configuration.Configuration) {
if config.HTTP.Debug.Prometheus.Enabled {
path := config.HTTP.Debug.Prometheus.Path
if path == "" {
path = "/metrics"
}
logrus.Info("providing prometheus metrics on ", path)
http.Handle(path, metrics.Handler())
}
}
func configureReporting(app *handlers.App) http.Handler { func configureReporting(app *handlers.App) http.Handler {
var handler http.Handler = app var handler http.Handler = app