118b0c9408
This fixes a data race on the listener(s) that get started in the metrics plugins. It also restore pkg/uniq to its former glory and removes and state being carried in there; this means for metrics that registry.go was to replicate that behavior *with* locking (as pkg/uniq doesn't do, or need that). Also renamed uniqAddr to just u, to make it slightly shorter. Signed-off-by: Miek Gieben <miek@miek.nl>
75 lines
1.2 KiB
Go
75 lines
1.2 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.OncePerServerBlock(func() error {
|
|
c.OnStartup(func() error {
|
|
return uniqAddr.ForEach()
|
|
})
|
|
return nil
|
|
})
|
|
|
|
c.OnStartup(func() error {
|
|
// Each plugin in this server block will (if they support it) report readiness.
|
|
plugs := dnsserver.GetConfig(c).Handlers()
|
|
for _, p := range plugs {
|
|
if r, ok := p.(Readiness); ok {
|
|
plugins.Append(r, p.Name())
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
c.OnRestart(rd.onRestart)
|
|
c.OnFinalShutdown(rd.onFinalShutdown)
|
|
|
|
return nil
|
|
}
|
|
|
|
func parse(c *caddy.Controller) (string, error) {
|
|
addr := ""
|
|
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
|
|
}
|