fix sysstat timeout error

closes #1134
This commit is contained in:
Rene Zbinden 2016-05-01 14:05:03 +02:00 committed by Cameron Sparr
parent 36d7b5c9ab
commit 4c8449f4bc
1 changed files with 2 additions and 2 deletions

View File

@ -199,9 +199,9 @@ func (s *Sysstat) collect() error {
options = append(options, strconv.Itoa(collectInterval), "2", s.tmpFile) options = append(options, strconv.Itoa(collectInterval), "2", s.tmpFile)
cmd := execCommand(s.Sadc, options...) cmd := execCommand(s.Sadc, options...)
out, err := internal.CombinedOutputTimeout(cmd, time.Second*5) out, err := internal.CombinedOutputTimeout(cmd, time.Second*time.Duration(collectInterval+parseInterval))
if err != nil { if err != nil {
return fmt.Errorf("failed to run command %s: %s", strings.Join(cmd.Args, " "), string(out)) return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
} }
return nil return nil
} }