Merge pull request #10 from kutovoys/stability

Fixed KillXray function: added process termination wait using cmd.Wait() to prevent accumulation of hanging Xray processes.
kutovoys · Sep 10, 2024 · 771e8f9 · 771e8f9
2 parents 8cde41e + 0555048
commit 771e8f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/main.go b/main.go
@@ -89,7 +89,9 @@ func processConfigFile(configPath string, provider models.Provider) {
 		utils.LogResult(logData)
 		return
 	}
+
 	defer utils.KillXray(cmd)
+
 	time.Sleep(4 * time.Second)
 
 	proxyClient, err := utils.CreateProxyClient(logData.ProxyAddress)

diff --git a/utils/utils.go b/utils/utils.go
@@ -120,7 +120,10 @@ func RunXray(configPath string) (*exec.Cmd, error) {
 }
 
 func KillXray(cmd *exec.Cmd) error {
-	return cmd.Process.Kill()
+	if err := cmd.Process.Kill(); err != nil {
+		return err
+	}
+	return cmd.Wait()
 }
 
 func CreateProxyClient(proxyAddress string) (*http.Client, error) {