dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix race condition

This commit is contained in:
Rene Zbinden 2016-03-29 22:22:38 +02:00 committed by Michele Fadda
parent 388cac2a2f
commit 6c0ea7b743
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,13 @@ func (s *Sysstat) collect() error {
if len(s.Activities) == 0 { if len(s.Activities) == 0 {
s.Activities = dfltActivities s.Activities = dfltActivities
} }
if len(s.Sadf) == 0 {
sadf, err := exec.LookPath("sadf")
if err != nil {
return errors.New("sadf not in $PATH, configure path to sadf")
}
s.Sadf = sadf
}
options := []string{} options := []string{}
for _, act := range s.Activities { for _, act := range s.Activities {
options = append(options, "-S", act) options = append(options, "-S", act)
@ -194,13 +201,6 @@ func (s *Sysstat) collect() error {
// Sadf -p -- -p <option> tmpFile // Sadf -p -- -p <option> tmpFile
// and parses the output to add it to the telegraf.Accumulator acc. // and parses the output to add it to the telegraf.Accumulator acc.
func (s *Sysstat) parse(acc telegraf.Accumulator, option string, ts time.Time) error { func (s *Sysstat) parse(acc telegraf.Accumulator, option string, ts time.Time) error {
if len(s.Sadf) == 0 {
sadf, err := exec.LookPath("sadf")
if err != nil {
return errors.New("sadf not in $PATH, configure path to sadf")
}
s.Sadf = sadf
}
cmd := execCommand(s.Sadf, s.sadfOptions(option)...) cmd := execCommand(s.Sadf, s.sadfOptions(option)...)
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {