CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

new format for listener section

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-06-28 10:45:34 -04:00
parent cfe991a335
commit eee0747e5e
4 changed files with 157 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
irc/server.go
View file

@ -865,7 +865,7 @@ func (server *Server) setupListeners(config *Config) (err error) {
// update or destroy all existing listeners
for addr := range server.listeners {
currentListener := server.listeners[addr]
newConfig, stillConfigured := config.Server.listeners[addr]
newConfig, stillConfigured := config.Server.trueListeners[addr]
currentListener.Lock()
currentListener.shouldStop = !stillConfigured
@ -883,7 +883,11 @@ func (server *Server) setupListeners(config *Config) (err error) {
}
// create new listeners that were not previously configured
for newAddr, newConfig := range config.Server.listeners {
numTlsListeners := 0
for newAddr, newConfig := range config.Server.trueListeners {
if newConfig.TLSConfig != nil {
numTlsListeners += 1
}
_, exists := server.listeners[newAddr]
if !exists {
// make new listener
@ -898,11 +902,11 @@ func (server *Server) setupListeners(config *Config) (err error) {
}
}
if len(config.Server.TLSListeners) == 0 {
if numTlsListeners == 0 {
server.logger.Warning("server", "You are not exposing an SSL/TLS listening port. You should expose at least one port (typically 6697) to accept TLS connections")
}
if config.Server.listeners[":6697"].TLSConfig == nil {
if config.Server.trueListeners[":6697"].TLSConfig == nil {
server.logger.Warning("server", "Port 6697 is the standard TLS port for IRC. You should (also) expose port 6697 as a TLS port to ensure clients can connect securely")
}