diff options
author | 2016-09-10 09:16:25 +0100 | |
---|---|---|
committer | 2016-09-10 09:16:25 +0100 | |
commit | 2dd8a687b340e5ef7afa4bbe8802f25372b25cf9 (patch) | |
tree | 3be78c3e5f9f80cef1c602b2c1be0804c92e01bc /test/server.go | |
parent | 5216ab6b581165ae54b5d3462e3e63d460317cf3 (diff) | |
download | coredns-2dd8a687b340e5ef7afa4bbe8802f25372b25cf9.tar.gz coredns-2dd8a687b340e5ef7afa4bbe8802f25372b25cf9.tar.zst coredns-2dd8a687b340e5ef7afa4bbe8802f25372b25cf9.zip |
Startup notification (#250)
Stop the caddy message and start our own init notifications.
Log the version of CoreDNS when starting up.
Fix all middleware's setup functions so that return the error prefixed
with *which* middleware was failing; leads to better debuggable errors
when starting up.
Diffstat (limited to 'test/server.go')
-rw-r--r-- | test/server.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/server.go b/test/server.go index 324ffdd8f..d3eab4135 100644 --- a/test/server.go +++ b/test/server.go @@ -12,6 +12,7 @@ import ( "github.com/miekg/dns" ) +// TCPServer returns a generic DNS server listening for TCP connections on laddr. func TCPServer(t *testing.T, laddr string) (*dns.Server, string, error) { l, err := net.Listen("tcp", laddr) if err != nil { @@ -33,6 +34,7 @@ func TCPServer(t *testing.T, laddr string) (*dns.Server, string, error) { return server, l.Addr().String(), nil } +// UDPServer returns a generic DNS server listening for UDP connections on laddr. func UDPServer(t *testing.T, laddr string) (*dns.Server, string, error) { pc, err := net.ListenPacket("udp", laddr) if err != nil { @@ -53,8 +55,11 @@ func UDPServer(t *testing.T, laddr string) (*dns.Server, string, error) { return server, pc.LocalAddr().String(), nil } -// CoreDNSServer returns a test server. It just takes a normal Corefile as input. -func CoreDNSServer(corefile string) (*caddy.Instance, error) { return caddy.Start(NewInput(corefile)) } +// CoreDNSServer returns a CoreDNS test server. It just takes a normal Corefile as input. +func CoreDNSServer(corefile string) (*caddy.Instance, error) { + caddy.Quiet = true + return caddy.Start(NewInput(corefile)) +} // CoreDNSSserverStop stops a server. func CoreDNSServerStop(i *caddy.Instance) { i.Stop() } |