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

Merge remote-tracking branch 'origin/fix.336.run.race.condition' into event-updates

Browse Source
This commit is contained in:
Paul Lorenz
2020-10-09 16:07:35 -04:00
parent 0642c21fbb 035eaca302
commit c120d6fb0c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ziti-controller/subcmd/run.go
+5 -4
View File
@@ -18,10 +18,10 @@ package subcmd
import (
"fmt"
"github.com/openziti/ziti/common/version"
"github.com/openziti/ziti/ziti/agent"
"github.com/openziti/edge/controller/server"
"github.com/openziti/fabric/controller"
"github.com/openziti/ziti/common/version"
"github.com/openziti/ziti/ziti/agent"
"github.com/spf13/cobra"
)
@@ -45,7 +45,7 @@ func run(cmd *cobra.Command, args []string) {
}
var c *controller.Controller
if c, err = controller.NewController(config, version.GetCmdBuildInfo()); err != nil {
if c, err = controller.NewController(config, version.GetCmdBuildInfo()); err != nil {
fmt.Printf("unable to create fabric controller %+v\n", err)
panic(err)
}
@@ -57,8 +57,9 @@ func run(cmd *cobra.Command, args []string) {
}
ec.SetHostController(c)
ec.Initialize()
go ec.InitAndRun()
go ec.RunAndWait()
if err = c.Run(); err != nil {
panic(err)