From 1cd842a8e3265a5bb28efa3bece8dfd638f84fea Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 6 Nov 2023 22:37:41 -0500 Subject: [PATCH] Fix ziti tunnel shutdown. Was deadlocking on shared mutex --- tunnel/intercept/svcpoll.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tunnel/intercept/svcpoll.go b/tunnel/intercept/svcpoll.go index ca3f439f0..256fecfa8 100644 --- a/tunnel/intercept/svcpoll.go +++ b/tunnel/intercept/svcpoll.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/edge-api/rest_model" + "github.com/openziti/foundation/v2/stringz" + "github.com/openziti/sdk-golang/ziti" "github.com/openziti/ziti/tunnel" "github.com/openziti/ziti/tunnel/dns" "github.com/openziti/ziti/tunnel/entities" "github.com/openziti/ziti/tunnel/health" - "github.com/openziti/foundation/v2/stringz" - "github.com/openziti/sdk-golang/ziti" "github.com/pkg/errors" logrus "github.com/sirupsen/logrus" "net" @@ -84,9 +84,6 @@ func (self *ServiceListenerGroup) WaitForShutdown() { break } - self.Lock() - defer self.Unlock() - for _, listener := range self.listener { listener.stop() }