gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 07:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

lol, put the signal handling in the right function

Browse Source
This commit is contained in:
dovholuknf
2023-09-01 08:12:09 -04:00
parent fce94f3554
commit ae795c29ce
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ziti/cmd/edge/quickstart.go
+17 -14
View File
@@ -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)
}