Try to reconnect to Riemann if metrics upload failed.
Signed-off-by: Eugene Chupriyanov <tchu@tchu.ru> Error checks added Don't Close() nil client Signed-off-by: Eugene Chupriyanov <e.chupriyanov@cpm.ru>
This commit is contained in:
parent
e428d11add
commit
288b8e0a68
|
@ -1,7 +1,6 @@
|
||||||
package riemann
|
package riemann
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"sort"
|
"sort"
|
||||||
|
@ -33,6 +32,7 @@ func (r *Riemann) Connect() error {
|
||||||
c, err := raidman.Dial(r.Transport, r.URL)
|
c, err := raidman.Dial(r.Transport, r.URL)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
r.client = nil
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,11 @@ func (r *Riemann) Connect() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Riemann) Close() error {
|
func (r *Riemann) Close() error {
|
||||||
|
if r.client == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
r.client.Close()
|
r.client.Close()
|
||||||
|
r.client = nil
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,6 +62,13 @@ func (r *Riemann) Write(metrics []telegraf.Metric) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if r.client == nil {
|
||||||
|
err := r.Connect()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("FAILED to (re)connect to Riemann. Error: %s\n", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var events []*raidman.Event
|
var events []*raidman.Event
|
||||||
for _, p := range metrics {
|
for _, p := range metrics {
|
||||||
evs := buildEvents(p, r.Separator)
|
evs := buildEvents(p, r.Separator)
|
||||||
|
@ -68,8 +79,16 @@ 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 {
|
||||||
return errors.New(fmt.Sprintf("FAILED to send riemann message: %s\n",
|
r.Close() // always retuns nil
|
||||||
senderr))
|
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",
|
||||||
|
senderr)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in New Issue