Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix start mesg for all protocol (#1617)

Browse Source 
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:
Miek Gieben
2018-03-17 19:04:01 +00:00
committed by GitHub
parent b813706baf
commit 182235458f
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/dnsserver/onstartup.go Normal file
View 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
}

6
core/dnsserver/server-grpc.go
View File

@@ -88,9 +88,11 @@ func (s *ServergRPC) OnStartupComplete() {
return
}
for zone, config := range s.zones {
fmt.Println(TransportGRPC + "://" + zone + ":" + config.Port)
out := startUpZones(TransportGRPC+"://", s.Addr, s.zones)
if out != "" {
fmt.Print(out)
}
return
}
// Stop stops the server. It blocks until the server is

6
core/dnsserver/server-tls.go
View File

@@ -72,7 +72,9 @@ func (s *ServerTLS) OnStartupComplete() {
return
}
for zone, config := range s.zones {
fmt.Println(TransportTLS + "://" + zone + ":" + config.Port)
out := startUpZones(TransportTLS+"://", s.Addr, s.zones)
if out != "" {
fmt.Print(out)
}
return
}

20
core/dnsserver/server.go
View File

@@ -294,23 +294,11 @@ func (s *Server) OnStartupComplete() {
return
}
for zone := range s.zones {
// split addr into protocol, IP and Port
_, ip, port, err := SplitProtocolHostPort(s.Addr)
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)
out := startUpZones("", s.Addr, s.zones)
if out != "" {
fmt.Print(out)
}
return
}
// Tracer returns the tracer in the server if defined.