From b93b4732ebf671e94d6a9e0e208c656709a2fc3a Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 17 Jul 2019 17:13:40 -0700 Subject: [PATCH] Start endpoint tunnel watch before waiting --- pkg/agent/tunnel/tunnel.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/agent/tunnel/tunnel.go b/pkg/agent/tunnel/tunnel.go index badc519ab9..ab02f2d513 100644 --- a/pkg/agent/tunnel/tunnel.go +++ b/pkg/agent/tunnel/tunnel.go @@ -83,7 +83,6 @@ func Setup(config *config.Node) error { disconnect[address] = connect(wg, address, config, transportConfig) } } - wg.Wait() go func() { connect: @@ -134,6 +133,8 @@ func Setup(config *config.Node) error { } }() + wg.Wait() + return nil } @@ -178,6 +179,9 @@ func connect(waitGroup *sync.WaitGroup, address string, config *config.Node, tra }) if ctx.Err() != nil { + if waitGroup != nil { + once.Do(waitGroup.Done) + } logrus.Infof("Stopped tunnel to %s", wsURL) return }