main: error handling in run group

This commit is contained in:
Mathis Raguin 2020-07-24 18:07:15 +02:00
parent e38b7aaefe
commit 3b6a93a35d
No known key found for this signature in database
GPG Key ID: 381F9DC4C20A59B4
1 changed files with 4 additions and 9 deletions

13
main.go
View File

@ -148,8 +148,7 @@ func main() {
// Run MetricsHandler
{
g.Add(func() error {
klog.Errorf("metricshandler error: %v", m.Run(ctx))
return ctx.Err()
return m.Run(ctx)
}, func(error) {
//cancel()
})
@ -174,9 +173,7 @@ func main() {
{
g.Add(func() error {
klog.Infof("Starting kube-state-metrics self metrics server: %s", telemetryListenAddress)
err = telemetryServer.Serve(telemetryLn)
klog.Errorf("kube-state-metrics self metrics server error: %v", err)
return err
return telemetryServer.Serve(telemetryLn)
}, func(error) {
telemetryServer.Shutdown(ctx)
})
@ -185,16 +182,14 @@ func main() {
{
g.Add(func() error {
klog.Infof("Starting metrics server: %s", metricsServerListenAddress)
err = metricsServer.Serve(metricsServerLn)
klog.Errorf("metrics server error: %v", err)
return err
return metricsServer.Serve(metricsServerLn)
}, func(error) {
metricsServer.Shutdown(ctx)
})
}
if err := g.Run(); err != nil {
klog.Fatalf("Failed to run Run Group: %v", err)
klog.Fatalf("RunGroup Error: %v", err)
}
klog.Info("Exiting")
}