From 17909a5db07e4def445cc5bd4d95edfd2ff9f974 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Thu, 7 May 2020 06:42:50 -0400 Subject: [PATCH] simplify listener rehash logic --- irc/server.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/irc/server.go b/irc/server.go index ade9a1df..f2a4efde 100644 --- a/irc/server.go +++ b/irc/server.go @@ -740,19 +740,13 @@ func (server *Server) setupListeners(config *Config) (err error) { newConfig, stillConfigured := config.Server.trueListeners[addr] if stillConfigured { - reloadErr := currentListener.Reload(newConfig) - // attempt to stop and replace the listener if the reload failed - if reloadErr != nil { + if reloadErr := currentListener.Reload(newConfig); reloadErr == nil { + logListener(addr, newConfig) + } else { + // stop the listener; we will attempt to replace it below currentListener.Stop() - newListener, newErr := NewListener(server, addr, newConfig, config.Server.UnixBindMode) - if newErr == nil { - server.listeners[addr] = newListener - } else { - delete(server.listeners, addr) - return newErr - } + delete(server.listeners, addr) } - logListener(addr, newConfig) } else { currentListener.Stop() delete(server.listeners, addr) @@ -761,7 +755,8 @@ func (server *Server) setupListeners(config *Config) (err error) { } publicPlaintextListener := "" - // create new listeners that were not previously configured + // create new listeners that were not previously configured, + // or that couldn't be reloaded above: for newAddr, newConfig := range config.Server.trueListeners { if strings.HasPrefix(newAddr, ":") && !newConfig.Tor && !newConfig.STSOnly && newConfig.TLSConfig == nil { publicPlaintextListener = newAddr