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

core: make coredns.Server a caddy.GracefulServer (#520)

Browse Source 
* core: make coredns.Server a caddy.GracefulServer

We needed to also implement the Address() method.

Fixes: #519

* Add compile time check if we implement caddy.GracefulServer

* Check if we should shutdown
This commit is contained in:
Miek Gieben
2017-02-10 19:50:31 +00:00
committed by GitHub
parent 3e196a6d57
commit 5f6c7682be
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dnsserver/register.go
View File

@@ -140,3 +140,5 @@ var (
// GracefulTimeout is the maximum duration of a graceful shutdown. // GracefulTimeout is the maximum duration of a graceful shutdown.
GracefulTimeout time.Duration GracefulTimeout time.Duration
) )
var _ caddy.GracefulServer = new(Server)

12
core/dnsserver/server.go
View File

@@ -74,6 +74,7 @@ func NewServer(addr string, group []*Config) (*Server, error) {
} }
// Serve starts the server with an existing listener. It blocks until the server stops. // Serve starts the server with an existing listener. It blocks until the server stops.
// This implements caddy.TCPServer interface.
func (s *Server) Serve(l net.Listener) error { func (s *Server) Serve(l net.Listener) error {
s.m.Lock() s.m.Lock()
s.server[tcp] = &dns.Server{Listener: l, Net: "tcp", Handler: s.mux} s.server[tcp] = &dns.Server{Listener: l, Net: "tcp", Handler: s.mux}
@@ -83,6 +84,7 @@ func (s *Server) Serve(l net.Listener) error {
} }
// ServePacket starts the server with an existing packetconn. It blocks until the server stops. // ServePacket starts the server with an existing packetconn. It blocks until the server stops.
// This implements caddy.UDPServer interface.
func (s *Server) ServePacket(p net.PacketConn) error { func (s *Server) ServePacket(p net.PacketConn) error {
s.m.Lock() s.m.Lock()
s.server[udp] = &dns.Server{PacketConn: p, Net: "udp", Handler: s.mux} s.server[udp] = &dns.Server{PacketConn: p, Net: "udp", Handler: s.mux}
@@ -121,6 +123,7 @@ func (s *Server) ListenPacket() (net.PacketConn, error) {
// connections to close (up to a max timeout of a few // connections to close (up to a max timeout of a few
// seconds); on Windows it will close the listener // seconds); on Windows it will close the listener
// immediately. // immediately.
// This implements Caddy.Stopper interface.
func (s *Server) Stop() (err error) { func (s *Server) Stop() (err error) {
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
@@ -150,18 +153,23 @@ func (s *Server) Stop() (err error) {
} }
for _, s1 := range s.server { for _, s1 := range s.server {
err = s1.Shutdown() // We might not have started and initialized the full set of servers
if s1 != nil {
err = s1.Shutdown()
}
} }
s.m.Unlock() s.m.Unlock()
return return
} }
// Address together with Stop() implement caddy.GracefulServer.
func (s *Server) Address() string { return s.Addr }
// ServeDNS is the entry point for every request to the address that s // ServeDNS is the entry point for every request to the address that s
// is bound to. It acts as a multiplexer for the requests zonename as // is bound to. It acts as a multiplexer for the requests zonename as
// defined in the request so that the correct zone // defined in the request so that the correct zone
// (configuration and middleware stack) will handle the request. // (configuration and middleware stack) will handle the request.
func (s *Server) ServeDNS(w dns.ResponseWriter, r *dns.Msg) { func (s *Server) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
// TODO(miek): expensive to use defer
defer func() { defer func() {
// In case the user doesn't enable error middleware, we still // In case the user doesn't enable error middleware, we still
// need to make sure that we stay alive up here // need to make sure that we stay alive up here