From ae795c29ce8b2fa254cb58f7cfd949c09b46e374 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Fri, 1 Sep 2023 08:12:09 -0400
Subject: [PATCH] lol, put the signal handling in the right function

---
 ziti/cmd/edge/quickstart.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/ziti/cmd/edge/quickstart.go b/ziti/cmd/edge/quickstart.go
index b43ee7354..595c2151e 100644
--- a/ziti/cmd/edge/quickstart.go
+++ b/ziti/cmd/edge/quickstart.go
@@ -162,15 +162,23 @@ func run(out io.Writer, errOut io.Writer) {
 		logrus.Fatal(erEnrollErr)
 	}
 
-	//./ziti router run ${ZITI_HOME}/${ZITI_HOSTNAME}-edge-router.yaml &> ${ZITI_HOME}/${ZITI_HOSTNAME}-edge-router.log &
-	erRunCmd := router.NewRunCmd()
-	erRunCmd.SetArgs([]string{
-		fmt.Sprintf(erYaml),
-	})
-	erRunCmdErr := erRunCmd.Execute()
-	if erRunCmdErr != nil {
-		logrus.Fatal(erRunCmdErr)
-	}
+	go func() {
+		//./ziti router run ${ZITI_HOME}/${ZITI_HOSTNAME}-edge-router.yaml &> ${ZITI_HOME}/${ZITI_HOSTNAME}-edge-router.log &
+		erRunCmd := router.NewRunCmd()
+		erRunCmd.SetArgs([]string{
+			fmt.Sprintf(erYaml),
+		})
+		erRunCmdErr := erRunCmd.Execute()
+		if erRunCmdErr != nil {
+			logrus.Fatal(erRunCmdErr)
+		}
+	}()
+
+	ch := make(chan os.Signal, 1)
+	signal.Notify(ch, os.Interrupt, syscall.SIGQUIT, syscall.SIGINT, syscall.SIGTERM)
+
+	<-ch
+	removeTempDir(tmpDir)
 }
 
 func createMinimalPki(out io.Writer, errOut io.Writer) {
@@ -231,9 +239,4 @@ func createMinimalPki(out io.Writer, errOut io.Writer) {
 	if clientErr != nil {
 		logrus.Fatal(clientErr)
 	}
-	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt, syscall.SIGQUIT, syscall.SIGINT, syscall.SIGTERM)
-
-	<-ch
-	removeTempDir(tmpDir)
 }