mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-31 02:03:20 -04:00 
			
		
		
		
	Add OnReStartFailed which makes the health plugin stay up if the Corefile is corrupt and we revert to the previous version. Also needs a fix for the channel handling See #2659 Testing it will log the following when restarting with a corrupted Corefile ~~~ 2019-05-04T18:01:59.431Z [INFO] linux/amd64, go1.12.4, CoreDNS-1.5.0 linux/amd64, go1.12.4, [INFO] SIGUSR1: Reloading [INFO] Reloading [ERROR] Restart failed: Corefile:5 - Error during parsing: Unknown directive 'bdhfhdhj' [ERROR] SIGUSR1: starting with listener file descriptors: Corefile:5 - Error during parsing: Unknown directive 'bdhfhdhj' ~~~ After which the curl still works. This also needed a change to reset the channel used for the metrics go-routine which gets closed on shutdown, otherwise you'll see: ~~~ ^C[INFO] SIGINT: Shutting down panic: close of closed channel goroutine 90 [running]: github.com/coredns/coredns/plugin/health.(*health).OnFinalShutdown(0xc000089bc0, 0xc000063d88, 0x4afe6d) ~~~ Signed-off-by: Miek Gieben <miek@miek.nl>
		
			
				
	
	
		
			71 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Package health implements an HTTP handler that responds to health checks.
 | |
| package health
 | |
| 
 | |
| import (
 | |
| 	"io"
 | |
| 	"net"
 | |
| 	"net/http"
 | |
| 	"time"
 | |
| 
 | |
| 	clog "github.com/coredns/coredns/plugin/pkg/log"
 | |
| )
 | |
| 
 | |
| var log = clog.NewWithPlugin("health")
 | |
| 
 | |
| // Health implements healthchecks by exporting a HTTP endpoint.
 | |
| type health struct {
 | |
| 	Addr     string
 | |
| 	lameduck time.Duration
 | |
| 
 | |
| 	ln      net.Listener
 | |
| 	nlSetup bool
 | |
| 	mux     *http.ServeMux
 | |
| 
 | |
| 	stop chan bool
 | |
| }
 | |
| 
 | |
| func (h *health) OnStartup() error {
 | |
| 	if h.Addr == "" {
 | |
| 		h.Addr = ":8080"
 | |
| 	}
 | |
| 	h.stop = make(chan bool)
 | |
| 
 | |
| 	ln, err := net.Listen("tcp", h.Addr)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	h.ln = ln
 | |
| 	h.mux = http.NewServeMux()
 | |
| 	h.nlSetup = true
 | |
| 
 | |
| 	h.mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
 | |
| 		// We're always healthy.
 | |
| 		w.WriteHeader(http.StatusOK)
 | |
| 		io.WriteString(w, "OK")
 | |
| 		return
 | |
| 	})
 | |
| 
 | |
| 	go func() { http.Serve(h.ln, h.mux) }()
 | |
| 	go func() { h.overloaded() }()
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (h *health) OnFinalShutdown() error {
 | |
| 	if !h.nlSetup {
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	if h.lameduck > 0 {
 | |
| 		log.Infof("Going into lameduck mode for %s", h.lameduck)
 | |
| 		time.Sleep(h.lameduck)
 | |
| 	}
 | |
| 
 | |
| 	h.ln.Close()
 | |
| 
 | |
| 	h.nlSetup = false
 | |
| 	close(h.stop)
 | |
| 	return nil
 | |
| }
 |