move proxy cleanup

kahnwong · Jun 18, 2024 · cee69a4 · cee69a4
1 parent 6b0ca31
commit cee69a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/cmd/connect.go b/cmd/connect.go
@@ -2,10 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
-	"syscall"
 
 	"github.com/spf13/cobra"
 )
@@ -60,22 +58,11 @@ var connectCmd = &cobra.Command{
 
 		// clean up proxy PID
 		if connInfo.ProxyKind != "" {
-			cleanup(proxyCmd)
+			killProxyPid(proxyCmd)
 		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(connectCmd)
 }
-
-// functions
-func cleanup(cmd *exec.Cmd) {
-	pgid, err := syscall.Getpgid(cmd.Process.Pid)
-	if err == nil {
-		err = syscall.Kill(-pgid, syscall.SIGKILL)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-}
diff --git a/cmd/utils_proxy.go b/cmd/utils_proxy.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"log"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -46,3 +47,13 @@ func CreateProxy(c Connection) (*exec.Cmd, int) {
 
 	return cmd, port
 }
+
+func killProxyPid(cmd *exec.Cmd) {
+	pgid, err := syscall.Getpgid(cmd.Process.Pid)
+	if err == nil {
+		err = syscall.Kill(-pgid, syscall.SIGKILL)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+}