feat: start()异步驱动部分调整同步Run()

Author: yexinf

internal/provider/engine/llamacpp.go

@@ -222,7 +222,7 @@ func (l *llamacppProvider) StartEngine(mode string) error {
 		LlamaSwapConfigFilePath := filepath.Join(l.EngineConfig.ExecPath, LlamaSwapConfigFile)
 		logger.EngineLogger.Info("[llamacpp] exec file path: ", execFile, l.EngineConfig.Host, LlamaSwapConfigFilePath)
 		cmd := exec.Command(execFile, "-listen", l.EngineConfig.Host, "-config", LlamaSwapConfigFilePath)
-		err := cmd.Start()
+		err := cmd.Run()
 		if err != nil {
 			logger.EngineLogger.Error("[llamacpp] failed to start llamacpp-server: " + err.Error())
 			return fmt.Errorf("failed to start llamacpp-server: %v", err)

internal/provider/engine/ollama.go

@@ -164,7 +164,7 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 		if runtime.GOOS == "windows" {
 			utils.SetCmdSysProcAttr(cmd)
 		}
-		err := cmd.Start()
+		err := cmd.Run()
 		if err != nil {
 			logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 			return fmt.Errorf("failed to start ollama: %v", err)
@@ -181,17 +181,13 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 			logger.EngineLogger.Error("[Ollama] failed to write pid file: " + err.Error())
 			return fmt.Errorf("failed to write pid file: %v", err)
 		}
-
-		go func() {
-			cmd.Wait()
-		}()
 	} else {
 		if utils.IpexOllamaSupportGPUStatus() {
 			cmd := exec.Command(o.EngineConfig.ExecPath + "/" + OllamaBatchFile)
 			if runtime.GOOS == "windows" {
 				utils.SetCmdSysProcAttr(cmd)
 			}
-			err := cmd.Start()
+			err := cmd.Run()
 			if err != nil {
 				logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 				return fmt.Errorf("failed to start ollama: %v", err)
@@ -201,7 +197,7 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 			if runtime.GOOS == "windows" {
 				utils.SetCmdSysProcAttr(cmd)
 			}
-			err := cmd.Start()
+			err := cmd.Run()
 			if err != nil {
 				logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 				return fmt.Errorf("failed to start ollama: %v", err)

internal/utils/server/server.go

@@ -52,7 +52,7 @@ func StartOadinServer(logPath string, pidFilePath string) error {
 	if runtime.GOOS == "windows" {
 		utils.SetCmdSysProcAttr(cmd)
 	}
-	if err := cmd.Start(); err != nil {
+	if err := cmd.Run(); err != nil {
 		logger.LogicLogger.Error("start server error: %v", err)
 		return fmt.Errorf("failed to start Oadin server: %v", err)
 	}
@@ -147,7 +147,7 @@ func TrayStopOadinServer() error {
 	if runtime.GOOS == "windows" {
 		utils.SetCmdSysProcAttr(cmd)
 	}
-	if err := cmd.Start(); err != nil {
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to start Oadin server: %v", err)
 	}
 	fmt.Printf("Oadin server stopping")

tray/systray.go

@@ -467,7 +467,7 @@ func StartOADINServerTray(logPath string, pidFilePath string) error {
 	cmd.Stderr = logFile
 	utils.SetCmdSysProcAttr(cmd)
 
-	if err := cmd.Start(); err != nil {
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to start oadin server: %v", err)
 	}
 

tray/utils/logging_windows.go

@@ -19,7 +19,7 @@ func ShowLogs() error {
 	cmd := exec.Command(cmd_path, "/c", "start", logPath)
 	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: false, CreationFlags: 0x08000000}
 
-	err := cmd.Start()
+	err := cmd.Run()
 	if err != nil {
 		slog.Error(fmt.Sprintf("Failed to open log dir: %s", err))
 		return err