command 超时优化

util/command_darwin.go

@@ -21,19 +21,25 @@ func ExecCommand(name string, args []string, timeout ...time.Duration) (out stri
 	cmd := exec.Command(name, args...)
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
-	time.AfterFunc(expire, func() { // 超时后，强制杀死进程
+
+	isDone := make(chan bool, 1)
+	go func() {
+		err = cmd.Run()
+		if err != nil {
+			err = fmt.Errorf("%s\n%s", err.Error(), stderr.String())
+		}
+		isDone <- true
+	}()
+
+	select {
+	case <-isDone:
+	case <-time.After(expire):
 		if cmd.Process != nil && cmd.Process.Pid != 0 {
 			pid := fmt.Sprintf("%d", cmd.Process.Pid)
 			out = out + fmt.Sprintf("\nexecute timeout: %v seconds.", expire.Seconds())
 			cmd.Process.Kill()
 			exec.Command("kill", "-9", pid).Run() // 强制杀死进程
 		}
-	})
-
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("%v\n%v\n%v", err.Error(), stderr.String(), out)
-		return
 	}
 	out = stdout.String()
 	return

util/command_linux.go

@@ -21,19 +21,25 @@ func ExecCommand(name string, args []string, timeout ...time.Duration) (out stri
 	cmd := exec.Command(name, args...)
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
-	time.AfterFunc(expire, func() { // 超时后，强制杀死进程
+
+	isDone := make(chan bool, 1)
+	go func() {
+		err = cmd.Run()
+		if err != nil {
+			err = fmt.Errorf("%s\n%s", err.Error(), stderr.String())
+		}
+		isDone <- true
+	}()
+
+	select {
+	case <-isDone:
+	case <-time.After(expire):
 		if cmd.Process != nil && cmd.Process.Pid != 0 {
 			pid := fmt.Sprintf("%d", cmd.Process.Pid)
 			out = out + fmt.Sprintf("\nexecute timeout: %v seconds.", expire.Seconds())
 			cmd.Process.Kill()
 			exec.Command("kill", "-9", pid).Run() // 强制杀死进程
 		}
-	})
-
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("%v\n%v\n%v", err.Error(), stderr.String(), out)
-		return
 	}
 	out = stdout.String()
 	return

util/command_windows.go

@@ -24,17 +24,23 @@ func ExecCommand(name string, args []string, timeout ...time.Duration) (out stri
 	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
-	time.AfterFunc(expire, func() { // 超时后，强制杀死进程
+
+	isDone := make(chan bool, 1)
+	go func() {
+		err = cmd.Run()
+		if err != nil {
+			err = fmt.Errorf("%s\n%s", err.Error(), stderr.String())
+		}
+		isDone <- true
+	}()
+
+	select {
+	case <-isDone:
+	case <-time.After(expire):
 		if cmd.Process != nil && cmd.Process.Pid != 0 {
-			out = out + fmt.Sprintf("\nexecute timeout: %v seconds.", expire.Seconds())
+			err = fmt.Errorf("execute timeout: %f minutes", expire.Minutes())
 			cmd.Process.Kill()
 		}
-	})
-
-	err = cmd.Run()
-	if err != nil {
-		err = fmt.Errorf("%v\n%v\n%v", err.Error(), stderr.String(), out)
-		return
 	}
 	out = stdout.String()
 	return