From bafde56a63f3c952b9d3d90f5363a630239e6483 Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 9 Oct 2020 04:18:10 -0400 Subject: [PATCH 1/3] fix for openziti/edge#336 - update deps - deal with init/run separation --- ziti-controller/subcmd/run.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ziti-controller/subcmd/run.go b/ziti-controller/subcmd/run.go index 021e76185..9ea61540d 100644 --- a/ziti-controller/subcmd/run.go +++ b/ziti-controller/subcmd/run.go @@ -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) From 260863799e088e805203e16ac31bd0a2aaa59047 Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 9 Oct 2020 04:21:59 -0400 Subject: [PATCH 2/3] update change log --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f55c6a1..c57b6f56a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Release 0.16.5 + +## Breaking Changes + +## What's New + * fix [edge#336 Startup Race Condition](https://github.com/openziti/edge/issues/336) + # Release 0.16.4 ## Breaking CLI Change From 035eaca302c1bc69f4f3d814a646bff3f3a33c5b Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 9 Oct 2020 08:16:06 -0400 Subject: [PATCH 3/3] dep update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1823476c3..54060f7c1 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc - github.com/openziti/edge v0.16.38 + github.com/openziti/edge v0.16.39 github.com/openziti/fabric v0.14.8 github.com/openziti/foundation v0.14.8 github.com/openziti/sdk-golang v0.13.52 diff --git a/go.sum b/go.sum index c5cc21ec2..c5cad4edf 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,8 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openziti/edge v0.16.38 h1:zV7P4cK8LO8NyGEiJlJo8Bxf0TjgI+BwRxdrhUg2pqg= -github.com/openziti/edge v0.16.38/go.mod h1:zaRj81nISMQrkegOfJeOAwhOlDJRTTxJkQOEC5DVrZo= +github.com/openziti/edge v0.16.39 h1:31+2R14QMjQnUDuvzADmZyPmuurZs0UQ/ez6R8+yWkQ= +github.com/openziti/edge v0.16.39/go.mod h1:zaRj81nISMQrkegOfJeOAwhOlDJRTTxJkQOEC5DVrZo= github.com/openziti/fabric v0.14.8 h1:ATV0EZwISvhhMiNl1VkYZ6Ia/rAnqc+Rnahx5QbJXQc= github.com/openziti/fabric v0.14.8/go.mod h1:fzxNGqL20fBWrvrMu+5UxjZVLaCrZmt/zcvgqD+zzjg= github.com/openziti/foundation v0.14.8 h1:WgQMZxXrMZHvqF9vhq541Djm7UjXZr+WMiAaFDskm48=