Refactor globpath pkg to return a map

this is so that we don't call os.Stat twice for every file matched
by Match(). Also changing the behavior to _not_ return the name of a
file that doesn't exist if it's not a glob.
This commit is contained in:
Cameron Sparr
2016-04-24 14:37:44 -06:00
parent d3a25e4dc1
commit 07728d7425
3 changed files with 41 additions and 25 deletions

View File

@@ -55,31 +55,29 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
f.globs[filepath] = g
}
for _, file := range g.Match() {
files := g.Match()
if len(files) == 0 {
acc.AddFields("filestat",
map[string]interface{}{
"exists": int64(0),
},
map[string]string{
"file": filepath,
})
continue
}
for fileName, fileInfo := range files {
tags := map[string]string{
"file": file,
"file": fileName,
}
fields := map[string]interface{}{
"exists": int64(0),
"exists": int64(1),
"size_bytes": fileInfo.Size(),
}
// Get file stats
fileInfo, err := os.Stat(file)
if os.IsNotExist(err) {
// file doesn't exist, so move on to the next
acc.AddFields("filestat", fields, tags)
continue
}
if err != nil {
errS += err.Error() + " "
continue
}
// file exists and no errors encountered
fields["exists"] = int64(1)
fields["size_bytes"] = fileInfo.Size()
if f.Md5 {
md5, err := getMd5(file)
md5, err := getMd5(fileName)
if err != nil {
errS += err.Error() + " "
} else {