academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve prometheus error handling (#108)

Browse Source
This commit is contained in:
Stephen Marshall
2018-06-04 15:31:03 +01:00
committed by Rob Parker
parent 2af6953b2b
commit 5d0a87ae0a
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/metrics/metrics.go
View File

@@ -69,7 +69,12 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
wg.Wait()
// Register metrics
prometheus.MustRegister(newExporter(qmName))
exporter := newExporter(qmName, log)
err := prometheus.Register(exporter)
if err != nil {
return fmt.Errorf("Failed to register metrics: %v", err)
}
defer prometheus.Unregister(exporter)
// Setup HTTP server to handle requests from Prometheus
http.Handle("/metrics", prometheus.Handler())
@@ -78,7 +83,7 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
w.Write([]byte("Status: METRICS ACTIVE"))
})
err := http.ListenAndServe(":"+defaultPort, nil)
err = http.ListenAndServe(":"+defaultPort, nil)
if err != nil {
return fmt.Errorf("Failed to handle metrics request: %v", err)
}