From 369ea5de0fb0330673396b3a11fdf614fa232354 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 30 Apr 2021 09:31:26 -0400 Subject: [PATCH] listener.close already cleaned up interceptor. don't need to do it again --- router/xgress_edge_tunnel/servicepoll.go | 3 +-- router/xgress_edge_tunnel/tunneler.go | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/router/xgress_edge_tunnel/servicepoll.go b/router/xgress_edge_tunnel/servicepoll.go index e2a9572f0..01d6e57fc 100644 --- a/router/xgress_edge_tunnel/servicepoll.go +++ b/router/xgress_edge_tunnel/servicepoll.go @@ -97,7 +97,7 @@ func (self *servicePoller) handleServiceListUpdate(lastUpdateToken []byte, servi } // TODO: just push updates down the control channel when necessary -func (self *servicePoller) pollServices(pollInterval time.Duration, notifyClose <-chan struct{}, closeHandler func()) { +func (self *servicePoller) pollServices(pollInterval time.Duration, notifyClose <-chan struct{}) { if err := self.fabricProvider.authenticate(); err != nil { logrus.WithError(err).Fatal("xgress_edge_tunnel unable to authenticate to controller. " + "ensure tunneler mode is enabled for this router or disable tunnel listener. exiting ") @@ -113,7 +113,6 @@ func (self *servicePoller) pollServices(pollInterval time.Duration, notifyClose case <-ticker.C: self.requestServiceListUpdate() case <-notifyClose: - closeHandler() return } } diff --git a/router/xgress_edge_tunnel/tunneler.go b/router/xgress_edge_tunnel/tunneler.go index 378bba063..ab53e5f37 100644 --- a/router/xgress_edge_tunnel/tunneler.go +++ b/router/xgress_edge_tunnel/tunneler.go @@ -27,7 +27,6 @@ import ( "github.com/openziti/fabric/router/xgress" cmap "github.com/orcaman/concurrent-map" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "net" ) @@ -87,11 +86,7 @@ func (self *tunneler) Start(notifyClose <-chan struct{}) error { self.servicePoller.serviceListener.HandleProviderReady(self.fabricProvider) self.interceptor.Start(self.fabricProvider) - go self.servicePoller.pollServices(self.listenOptions.svcPollRate, notifyClose, func() { - logrus.Info("stopping xgress_edge_tunnel.interceptor") - self.interceptor.Stop() - logrus.Info("stopped xgress_edge_tunnel.interceptor") - }) + go self.servicePoller.pollServices(self.listenOptions.svcPollRate, notifyClose) return nil }