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

use AddError everywhere (#2372)

Browse Source
This commit is contained in:
Patrick Hemmer
2017-04-24 14:13:26 -04:00
committed by Daniel Nelson
parent 801f6cb8a0
commit 06baf7cf78
95 changed files with 341 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/inputs/memcached/memcached.go
View File

@@ -9,7 +9,6 @@ import (
"time"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal/errchan"
"github.com/influxdata/telegraf/plugins/inputs"
)
@@ -73,16 +72,15 @@ func (m *Memcached) Gather(acc telegraf.Accumulator) error {
return m.gatherServer(":11211", false, acc)
}
errChan := errchan.New(len(m.Servers) + len(m.UnixSockets))
for _, serverAddress := range m.Servers {
errChan.C <- m.gatherServer(serverAddress, false, acc)
acc.AddError(m.gatherServer(serverAddress, false, acc))
}
for _, unixAddress := range m.UnixSockets {
errChan.C <- m.gatherServer(unixAddress, true, acc)
acc.AddError(m.gatherServer(unixAddress, true, acc))
}
return errChan.Error()
return nil
}
func (m *Memcached) gatherServer(

2
plugins/inputs/memcached/memcached_test.go
View File

@@ -21,7 +21,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
var acc testutil.Accumulator
err := m.Gather(&acc)
err := acc.GatherError(m.Gather)
require.NoError(t, err)
intMetrics := []string{"get_hits", "get_misses", "evictions",