a1c97f82a6
Add OnRestartFailed to the ready plugin and some various cleanups.
Document slightly better how things are supposed to work with multiple
`ready`'s in the multiple Server Blocks.
All manually tested with this Corefile:
~~~
. {
log
ready
}
example.org {
log
chaos
ready
}
~~~
And then `kill -SIGUSR1` and curling the ready endpoint. This works
well, the FailedReload is triggered by adding a syntax error in the
Corefile.
See #2659
Signed-off-by: Miek Gieben <miek@miek.nl>
78 lines
1.5 KiB
Go
78 lines
1.5 KiB
Go
package ready
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
|
|
"github.com/mholt/caddy"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterPlugin("ready", caddy.Plugin{
|
|
ServerType: "dns",
|
|
Action: setup,
|
|
})
|
|
}
|
|
|
|
func setup(c *caddy.Controller) error {
|
|
addr, err := parse(c)
|
|
if err != nil {
|
|
return plugin.Error("ready", err)
|
|
}
|
|
rd := &ready{Addr: addr}
|
|
|
|
uniqAddr.Set(addr, rd.onStartup)
|
|
c.OnStartup(func() error { uniqAddr.Set(addr, rd.onStartup); return nil })
|
|
c.OnRestartFailed(func() error { uniqAddr.Set(addr, rd.onStartup); return nil })
|
|
|
|
c.OnStartup(func() error { return uniqAddr.ForEach() })
|
|
c.OnRestartFailed(func() error { return uniqAddr.ForEach() })
|
|
|
|
c.OnStartup(func() error {
|
|
for _, p := range dnsserver.GetConfig(c).Handlers() {
|
|
if r, ok := p.(Readiness); ok {
|
|
plugins.Append(r, p.Name())
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
c.OnRestartFailed(func() error {
|
|
for _, p := range dnsserver.GetConfig(c).Handlers() {
|
|
if r, ok := p.(Readiness); ok {
|
|
plugins.Append(r, p.Name())
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
c.OnRestart(rd.onFinalShutdown)
|
|
c.OnFinalShutdown(rd.onFinalShutdown)
|
|
|
|
return nil
|
|
}
|
|
|
|
func parse(c *caddy.Controller) (string, error) {
|
|
addr := ":8181"
|
|
i := 0
|
|
for c.Next() {
|
|
if i > 0 {
|
|
return "", plugin.ErrOnce
|
|
}
|
|
i++
|
|
args := c.RemainingArgs()
|
|
|
|
switch len(args) {
|
|
case 0:
|
|
case 1:
|
|
addr = args[0]
|
|
if _, _, e := net.SplitHostPort(addr); e != nil {
|
|
return "", e
|
|
}
|
|
default:
|
|
return "", c.ArgErr()
|
|
}
|
|
}
|
|
return addr, nil
|
|
}
|