004c5fca9d
Abstract the caddy call and make it simpler. See #3261 for some part of the discussion. Go from: ~~~ go func init() { caddy.RegisterPlugin("any", caddy.Plugin{ ServerType: "dns", Action: setup, }) } ~~~ To: ~~~ go func init() { plugin.Register("any", setup) } ~~~ This requires some external documents in coredns.io to be updated as well; the old way still works, so it's backwards compatible. Signed-off-by: Miek Gieben <miek@miek.nl>
73 lines
1.4 KiB
Go
73 lines
1.4 KiB
Go
package ready
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/coredns/coredns/core/dnsserver"
|
|
"github.com/coredns/coredns/plugin"
|
|
|
|
"github.com/caddyserver/caddy"
|
|
)
|
|
|
|
func init() { plugin.Register("ready", 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
|
|
}
|