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

Just close Riemann client on send metrics failure 

Signed-off-by: Eugene Chupriyanov <e.chupriyanov@cpm.ru>

closes #1013
This commit is contained in:
Eugene Chupriyanov 2016-04-19 01:08:18 +03:00 committed by Cameron Sparr
parent 708a97d773
commit c737a19d9f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ based on _prefix_ in addition to globs. This means that a filter like
### Bugfixes ### Bugfixes
- [#921](https://github.com/influxdata/telegraf/pull/921): mqtt_consumer stops gathering metrics. Thanks @chaton78! - [#921](https://github.com/influxdata/telegraf/pull/921): mqtt_consumer stops gathering metrics. Thanks @chaton78!
- [#1013](https://github.com/influxdata/telegraf/pull/1013): Close dead riemann output connections. Thanks @echupriyanov!
## v0.12.1 [2016-04-14] ## v0.12.1 [2016-04-14]

7
plugins/outputs/riemann/riemann.go
View File

@ -80,16 +80,9 @@ func (r *Riemann) Write(metrics []telegraf.Metric) error {
var senderr = r.client.SendMulti(events) var senderr = r.client.SendMulti(events)
if senderr != nil { if senderr != nil {
r.Close() // always retuns nil r.Close() // always retuns nil
connerr := r.Connect()
if connerr != nil {
return fmt.Errorf("FAILED to (re)connect to Riemann. Error: %s\n", connerr)
}
senderr = r.client.SendMulti(events)
if senderr != nil {
return fmt.Errorf("FAILED to send riemann message (will try to reconnect). Error: %s\n", return fmt.Errorf("FAILED to send riemann message (will try to reconnect). Error: %s\n",
senderr) senderr)
} }
}
return nil return nil
} }