fix sysstat timeout error

closes #1134
2016-05-02 15:17:11 -06:00
parent 36d7b5c9ab
commit 4c8449f4bc
1 changed files with 2 additions and 2 deletions
@@ -199,9 +199,9 @@ func (s *Sysstat) collect() error {

 	options = append(options, strconv.Itoa(collectInterval), "2", s.tmpFile)
 	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 {
-		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
 }