summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frei <freisim93@gmail.com>2021-05-11 14:35:13 +0200
committerGitHub <noreply@github.com>2021-05-11 14:35:13 +0200
commitc494ced21f9e7a6d0514e4de66ffcfd2300412db (patch)
treeeaa5b6a1262d5936e5ac5360558648b453c1600a
parenta8e2fc6f61cc0674ee3f9576abc0f4a52f0b86d9 (diff)
lib/connections: Actually remove listenerSupervisor (ref #7644) (#7663)v1.17.0-rc.2
-rw-r--r--lib/connections/service.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/connections/service.go b/lib/connections/service.go
index a8afbc56e..7859a9e93 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)
}