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

fix: log err when loading mibs (#10735)

This commit is contained in:
reimda 2022-02-28 11:37:08 -07:00 committed by GitHub
parent ffe0b7e184
commit 79aa7f4ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/snmp/translate.go
View File

@ -62,12 +62,12 @@ func LoadMibsFromPath(paths []string, log telegraf.Logger, loader MibLoader) err
if info.Mode()&os.ModeSymlink != 0 { if info.Mode()&os.ModeSymlink != 0 {
target, err := filepath.EvalSymlinks(path) target, err := filepath.EvalSymlinks(path)
if err != nil { if err != nil {
log.Warnf("Bad symbolic link %v", target) log.Warnf("Couldn't evaluate symbolic links for %v: %v", target, err)
continue continue
} }
info, err = os.Lstat(filepath.Join(path, target)) info, err = os.Lstat(filepath.Join(path, target))
if err != nil { if err != nil {
log.Warnf("Couldn't stat target %v", target) log.Warnf("Couldn't stat target %v: %v", target, err)
continue continue
} }
path = target path = target
@ -75,7 +75,7 @@ func LoadMibsFromPath(paths []string, log telegraf.Logger, loader MibLoader) err
if info.Mode().IsRegular() { if info.Mode().IsRegular() {
err := loader.loadModule(info.Name()) err := loader.loadModule(info.Name())
if err != nil { if err != nil {
log.Warnf("module %v could not be loaded", info.Name()) log.Warnf("Couldn't load module %v: %v", info.Name(), err)
continue continue
} }
} }
@ -113,11 +113,11 @@ func walkPaths(paths []string, log telegraf.Logger) ([]string, error) {
if info.Mode()&os.ModeSymlink != 0 { if info.Mode()&os.ModeSymlink != 0 {
target, err := filepath.EvalSymlinks(path) target, err := filepath.EvalSymlinks(path)
if err != nil { if err != nil {
log.Warnf("Could not evaluate link %v", target) log.Warnf("Couldn't evaluate symbolic links for %v: %v", target, err)
} }
info, err = os.Lstat(target) info, err = os.Lstat(target)
if err != nil { if err != nil {
log.Warnf("Couldn't stat target %v", path) log.Warnf("Couldn't stat target %v: %v", target, err)
} }
path = target path = target
} }
@ -128,7 +128,7 @@ func walkPaths(paths []string, log telegraf.Logger) ([]string, error) {
return nil return nil
}) })
if err != nil { if err != nil {
return folders, fmt.Errorf("Filepath %q could not be walked: %v", mibPath, err) return folders, fmt.Errorf("Couldn't walk path %q: %v", mibPath, err)
} }
} }
return folders, nil return folders, nil