From c494ced21f9e7a6d0514e4de66ffcfd2300412db Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 11 May 2021 14:35:13 +0200 Subject: lib/connections: Actually remove listenerSupervisor (ref #7644) (#7663) --- lib/connections/service.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/connections/service.go b/lib/connections/service.go index a8afbc56e8..7859a9e938 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -146,7 +146,6 @@ type service struct { listenersMut sync.RWMutex listeners map[string]genericListener listenerTokens map[string]suture.ServiceToken - listenerSupervisor *suture.Supervisor } func NewService(cfg config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *tls.Config, discoverer discover.Finder, bepProtocolName string, tlsDefaultCommonName string, evLogger events.Logger) Service { @@ -725,7 +724,7 @@ func (s *service) CommitConfiguration(from, to config.Configuration) bool { for addr, listener := range s.listeners { if _, ok := seen[addr]; !ok || listener.Factory().Valid(to) != nil { l.Debugln("Stopping listener", addr) - s.listenerSupervisor.Remove(s.listenerTokens[addr]) + s.Remove(s.listenerTokens[addr]) delete(s.listenerTokens, addr) delete(s.listeners, addr) } -- cgit v1.2.3