Merge pull request #1505 from openziti/fix-ziti-tunnel-shutdown

Fix ziti tunnel shutdown. Was deadlocking on shared mutex
openziti · Nov 7, 2023 · e526aba · e526aba
2 parents 5e64063 + 1cd842a
commit e526aba
Showing 1 changed file with 2 additions and 5 deletions.
diff --git 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()
 	}