|
@@ -1551,6 +1551,12 @@ func (server *Server) loadDatastore(datastorePath string) error {
|
1551
|
1551
|
}
|
1552
|
1552
|
|
1553
|
1553
|
func (server *Server) setupListeners(config *Config) {
|
|
1554
|
+ logListener := func(addr string, tlsconfig *tls.Config) {
|
|
1555
|
+ server.logger.Info("listeners",
|
|
1556
|
+ fmt.Sprintf("now listening on %s, tls=%t.", addr, (tlsconfig != nil)),
|
|
1557
|
+ )
|
|
1558
|
+ }
|
|
1559
|
+
|
1554
|
1560
|
// update or destroy all existing listeners
|
1555
|
1561
|
tlsListeners := config.TLSListeners()
|
1556
|
1562
|
for addr := range server.listeners {
|
|
@@ -1573,9 +1579,7 @@ func (server *Server) setupListeners(config *Config) {
|
1573
|
1579
|
currentListener.configMutex.Unlock()
|
1574
|
1580
|
|
1575
|
1581
|
if stillConfigured {
|
1576
|
|
- server.logger.Info("listeners",
|
1577
|
|
- fmt.Sprintf("now listening on %s, tls=%t.", addr, (currentListener.tlsConfig != nil)),
|
1578
|
|
- )
|
|
1582
|
+ logListener(addr, currentListener.tlsConfig)
|
1579
|
1583
|
} else {
|
1580
|
1584
|
// tell the listener it should stop by interrupting its Accept() call:
|
1581
|
1585
|
currentListener.listener.Close()
|
|
@@ -1591,7 +1595,9 @@ func (server *Server) setupListeners(config *Config) {
|
1591
|
1595
|
_, exists := server.listeners[newaddr]
|
1592
|
1596
|
if !exists {
|
1593
|
1597
|
// make new listener
|
1594
|
|
- server.listeners[newaddr] = server.createListener(newaddr, tlsListeners[newaddr])
|
|
1598
|
+ tlsConfig := tlsListeners[newaddr]
|
|
1599
|
+ server.listeners[newaddr] = server.createListener(newaddr, tlsConfig)
|
|
1600
|
+ logListener(newaddr, tlsConfig)
|
1595
|
1601
|
}
|
1596
|
1602
|
}
|
1597
|
1603
|
|