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/tail/tail.go
View File

@@ -80,7 +80,6 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
}
}
var errS string
// Create a "tailer" for each file
for _, filepath := range t.Files {
g, err := globpath.Compile(filepath)
@@ -97,7 +96,7 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
Pipe: t.Pipe,
})
if err != nil {
errS += err.Error() + " "
acc.AddError(err)
continue
}
// create a goroutine for each "tailer"
@@ -107,9 +106,6 @@ func (t *Tail) Start(acc telegraf.Accumulator) error {
}
}
if errS != "" {
return fmt.Errorf(errS)
}
return nil
}

6
plugins/inputs/tail/tail_test.go
View File

@@ -30,7 +30,7 @@ func TestTailFromBeginning(t *testing.T) {
acc := testutil.Accumulator{}
require.NoError(t, tt.Start(&acc))
require.NoError(t, tt.Gather(&acc))
require.NoError(t, acc.GatherError(tt.Gather))
acc.Wait(1)
acc.AssertContainsTaggedFields(t, "cpu",
@@ -67,7 +67,7 @@ func TestTailFromEnd(t *testing.T) {
_, err = tmpfile.WriteString("cpu,othertag=foo usage_idle=100\n")
require.NoError(t, err)
require.NoError(t, tt.Gather(&acc))
require.NoError(t, acc.GatherError(tt.Gather))
acc.Wait(1)
acc.AssertContainsTaggedFields(t, "cpu",
@@ -98,7 +98,7 @@ func TestTailBadLine(t *testing.T) {
_, err = tmpfile.WriteString("cpu mytag= foo usage_idle= 100\n")
require.NoError(t, err)
require.NoError(t, tt.Gather(&acc))
require.NoError(t, acc.GatherError(tt.Gather))
acc.WaitError(1)
assert.Contains(t, acc.Errors[0].Error(), "E! Malformed log line")