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

Add timeout to wavefront output write (#3711) 

(cherry picked from commit 3e4c91880a)
This commit is contained in:
Pierre Tessier 2018-01-25 16:44:25 -05:00 committed by Daniel Nelson
parent 2bb97154db
commit 8733d3826a
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/outputs/wavefront/wavefront.go
View File

@ -11,6 +11,7 @@ import (
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/outputs"
"time"
) )
type Wavefront struct { type Wavefront struct {
@ -101,13 +102,11 @@ func (w *Wavefront) Connect() error {
uri := fmt.Sprintf("%s:%d", w.Host, w.Port) uri := fmt.Sprintf("%s:%d", w.Host, w.Port)
_, err := net.ResolveTCPAddr("tcp", uri) _, err := net.ResolveTCPAddr("tcp", uri)
if err != nil { if err != nil {
log.Printf("Wavefront: TCP address cannot be resolved %s", err.Error()) return fmt.Errorf("Wavefront: TCP address cannot be resolved %s", err.Error())
return nil
} }
connection, err := net.Dial("tcp", uri) connection, err := net.Dial("tcp", uri)
if err != nil { if err != nil {
log.Printf("Wavefront: TCP connect fail %s", err.Error()) return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
return nil
} }
defer connection.Close() defer connection.Close()
return nil return nil
@ -122,6 +121,7 @@ func (w *Wavefront) Write(metrics []telegraf.Metric) error {
return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error()) return fmt.Errorf("Wavefront: TCP connect fail %s", err.Error())
} }
defer connection.Close() defer connection.Close()
connection.SetWriteDeadline(time.Now().Add(5 * time.Second))
for _, m := range metrics { for _, m := range metrics {
for _, metricPoint := range buildMetrics(m, w) { for _, metricPoint := range buildMetrics(m, w) {