Add exec output plugin (#6267)
This commit is contained in:
@@ -230,17 +230,17 @@ func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
|
||||
timer := time.AfterFunc(timeout, func() {
|
||||
err := c.Process.Kill()
|
||||
if err != nil {
|
||||
log.Printf("E! FATAL error killing process: %s", err)
|
||||
log.Printf("E! [agent] Error killing process: %s", err)
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
err := c.Wait()
|
||||
isTimeout := timer.Stop()
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if isTimeout == false {
|
||||
if !timer.Stop() {
|
||||
return TimeoutErr
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user