dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix prometheus output panic on reload 

closes #1530
This commit is contained in:
Cameron Sparr 2016-09-12 10:09:13 +01:00
parent b2ea39077e
commit c3aa43a6bd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@
- [#1738](https://github.com/influxdata/telegraf/issues/1738): Fix unmarshal of influxdb metrics with null tags - [#1738](https://github.com/influxdata/telegraf/issues/1738): Fix unmarshal of influxdb metrics with null tags
- [#1733](https://github.com/influxdata/telegraf/issues/1733): Fix statsd scientific notation parsing - [#1733](https://github.com/influxdata/telegraf/issues/1733): Fix statsd scientific notation parsing
- [#1716](https://github.com/influxdata/telegraf/issues/1716): Sensors plugin strconv.ParseFloat: parsing "": invalid syntax - [#1716](https://github.com/influxdata/telegraf/issues/1716): Sensors plugin strconv.ParseFloat: parsing "": invalid syntax
- [#1530](https://github.com/influxdata/telegraf/issues/1530): Fix prometheus_client reload panic
## v1.0 [2016-09-08] ## v1.0 [2016-09-08]

2
plugins/outputs/prometheus_client/prometheus_client.go
View File

@ -28,7 +28,7 @@ var sampleConfig = `
` `
func (p *PrometheusClient) Start() error { func (p *PrometheusClient) Start() error {
prometheus.MustRegister(p) prometheus.Register(p)
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
// recovering from panic here because there is no way to stop a // recovering from panic here because there is no way to stop a