CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(inputs/file): More clear error messages (#11104)

This commit is contained in:
Thomas Casteleyn 2022-05-17 00:21:46 +02:00 committed by GitHub
parent 1d659f5fbe
commit 69314405ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/inputs/file/file.go
View File

@ -59,11 +59,11 @@ func (f *File) refreshFilePaths() error {
for _, file := range f.Files { for _, file := range f.Files {
g, err := globpath.Compile(file) g, err := globpath.Compile(file)
if err != nil { if err != nil {
return fmt.Errorf("could not compile glob %v: %v", file, err) return fmt.Errorf("could not compile glob %q: %w", file, err)
} }
files := g.Match() files := g.Match()
if len(files) <= 0 { if len(files) <= 0 {
return fmt.Errorf("could not find file: %v", file) return fmt.Errorf("could not find file(s): %v", file)
} }
allFiles = append(allFiles, files...) allFiles = append(allFiles, files...)
} }
@ -82,13 +82,17 @@ func (f *File) readMetric(filename string) ([]telegraf.Metric, error) {
r, _ := utfbom.Skip(f.decoder.Reader(file)) r, _ := utfbom.Skip(f.decoder.Reader(file))
fileContents, err := io.ReadAll(r) fileContents, err := io.ReadAll(r)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not read %q: %s", filename, err) return nil, fmt.Errorf("could not read %q: %w", filename, err)
} }
parser, err := f.parserFunc() parser, err := f.parserFunc()
if err != nil { if err != nil {
return nil, fmt.Errorf("could not instantiate parser: %s", err) return nil, fmt.Errorf("could not instantiate parser: %w", err)
} }
return parser.Parse(fileContents) metrics, err := parser.Parse(fileContents)
if err != nil {
return metrics, fmt.Errorf("could not parse %q: %w", filename, err)
}
return metrics, err
} }
func init() { func init() {