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

6
plugins/inputs/phpfpm/phpfpm.go
View File

@@ -80,19 +80,17 @@ func (g *phpfpm) Gather(acc telegraf.Accumulator) error {
var wg sync.WaitGroup
var outerr error
for _, serv := range g.Urls {
wg.Add(1)
go func(serv string) {
defer wg.Done()
outerr = g.gatherServer(serv, acc)
acc.AddError(g.gatherServer(serv, acc))
}(serv)
}
wg.Wait()
return outerr
return nil
}
// Request status page to get stat raw data and import it

14
plugins/inputs/phpfpm/phpfpm_test.go
View File

@@ -35,7 +35,7 @@ func TestPhpFpmGeneratesMetrics_From_Http(t *testing.T) {
var acc testutil.Accumulator
err := r.Gather(&acc)
err := acc.GatherError(r.Gather)
require.NoError(t, err)
tags := map[string]string{
@@ -75,7 +75,7 @@ func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
}
var acc testutil.Accumulator
err = r.Gather(&acc)
err = acc.GatherError(r.Gather)
require.NoError(t, err)
tags := map[string]string{
@@ -119,7 +119,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket(t *testing.T) {
var acc testutil.Accumulator
err = r.Gather(&acc)
err = acc.GatherError(r.Gather)
require.NoError(t, err)
tags := map[string]string{
@@ -163,7 +163,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket_Custom_Status_Path(t *testing.T) {
var acc testutil.Accumulator
err = r.Gather(&acc)
err = acc.GatherError(r.Gather)
require.NoError(t, err)
tags := map[string]string{
@@ -193,7 +193,7 @@ func TestPhpFpmDefaultGetFromLocalhost(t *testing.T) {
var acc testutil.Accumulator
err := r.Gather(&acc)
err := acc.GatherError(r.Gather)
require.Error(t, err)
assert.Contains(t, err.Error(), "127.0.0.1/status")
}
@@ -205,7 +205,7 @@ func TestPhpFpmGeneratesMetrics_Throw_Error_When_Fpm_Status_Is_Not_Responding(t
var acc testutil.Accumulator
err := r.Gather(&acc)
err := acc.GatherError(r.Gather)
require.Error(t, err)
assert.Contains(t, err.Error(), `Unable to connect to phpfpm status page 'http://aninvalidone': Get http://aninvalidone: dial tcp: lookup aninvalidone`)
}
@@ -217,7 +217,7 @@ func TestPhpFpmGeneratesMetrics_Throw_Error_When_Socket_Path_Is_Invalid(t *testi
var acc testutil.Accumulator
err := r.Gather(&acc)
err := acc.GatherError(r.Gather)
require.Error(t, err)
assert.Equal(t, `Socket doesn't exist '/tmp/invalid.sock': stat /tmp/invalid.sock: no such file or directory`, err.Error())