mirror of
https://github.com/coredns/coredns.git
synced 2025-10-28 08:44:17 -04:00
Fix start mesg for all protocol (#1617)
Recent bind refactoring missed this:
grpc://example.com.:1055
example.com.:1053 on 127.0.0.1
now becomes
grpc://example.com.:1055 on 127.0.0.1
example.com.:1053 on 127.0.0.1
If you're using *bind* directive.
This commit is contained in:
29
core/dnsserver/onstartup.go
Normal file
29
core/dnsserver/onstartup.go
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
package dnsserver
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// startUpZones create the text that we show when starting up:
|
||||||
|
// grpc://example.com.:1055
|
||||||
|
// example.com.:1053 on 127.0.0.1
|
||||||
|
func startUpZones(protocol, addr string, zones map[string]*Config) string {
|
||||||
|
s := ""
|
||||||
|
|
||||||
|
for zone := range zones {
|
||||||
|
// split addr into protocol, IP and Port
|
||||||
|
_, ip, port, err := SplitProtocolHostPort(addr)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
// this should not happen, but we need to take care of it anyway
|
||||||
|
s += fmt.Sprintln(protocol + zone + ":" + addr)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ip == "" {
|
||||||
|
s += fmt.Sprintln(protocol + zone + ":" + port)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// if the server is listening on a specific address let's make it visible in the log,
|
||||||
|
// so one can differentiate between all active listeners
|
||||||
|
s += fmt.Sprintln(protocol + zone + ":" + port + " on " + ip)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -88,9 +88,11 @@ func (s *ServergRPC) OnStartupComplete() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for zone, config := range s.zones {
|
out := startUpZones(TransportGRPC+"://", s.Addr, s.zones)
|
||||||
fmt.Println(TransportGRPC + "://" + zone + ":" + config.Port)
|
if out != "" {
|
||||||
|
fmt.Print(out)
|
||||||
}
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop stops the server. It blocks until the server is
|
// Stop stops the server. It blocks until the server is
|
||||||
|
|||||||
@@ -72,7 +72,9 @@ func (s *ServerTLS) OnStartupComplete() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for zone, config := range s.zones {
|
out := startUpZones(TransportTLS+"://", s.Addr, s.zones)
|
||||||
fmt.Println(TransportTLS + "://" + zone + ":" + config.Port)
|
if out != "" {
|
||||||
|
fmt.Print(out)
|
||||||
}
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -294,23 +294,11 @@ func (s *Server) OnStartupComplete() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for zone := range s.zones {
|
out := startUpZones("", s.Addr, s.zones)
|
||||||
// split addr into protocol, IP and Port
|
if out != "" {
|
||||||
_, ip, port, err := SplitProtocolHostPort(s.Addr)
|
fmt.Print(out)
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
// this should not happen, but we need to take care of it anyway
|
|
||||||
fmt.Println(zone + ":" + s.Addr)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if ip == "" {
|
|
||||||
fmt.Println(zone + ":" + port)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// if the server is listening on a specific address let's make it visible in the log,
|
|
||||||
// so one can differentiate between all active listeners
|
|
||||||
fmt.Println(zone + ":" + port + " on " + ip)
|
|
||||||
}
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tracer returns the tracer in the server if defined.
|
// Tracer returns the tracer in the server if defined.
|
||||||
|
|||||||
Reference in New Issue
Block a user