middleware/metrics: fix crash on startup (#318)

Make the methods that handle Metrics all use pointer receivers to fix
sync.Once not being initialized.

Finish the setup_test to test for failures. And make the check for the
address more strict and return an error when it does not have a port
number.

Add a toplevel test that starts a CoreDNS server with metrics enabled
so we catch these errors in the future.
This commit is contained in:
Miek Gieben 2016-10-04 11:05:04 +01:00 committed by GitHub
parent d914832904
commit db6c9a3f01
5 changed files with 53 additions and 16 deletions

View file

@ -1,6 +1,7 @@
package metrics
import (
"net"
"sync"
"github.com/miekg/coredns/core/dnsserver"
@ -35,15 +36,15 @@ func setup(c *caddy.Controller) error {
return nil
}
func prometheusParse(c *caddy.Controller) (Metrics, error) {
func prometheusParse(c *caddy.Controller) (*Metrics, error) {
var (
met Metrics
met = &Metrics{Addr: addr}
err error
)
for c.Next() {
if len(met.ZoneNames) > 0 {
return Metrics{}, c.Err("metrics: can only have one metrics module per server")
return met, c.Err("metrics: can only have one metrics module per server")
}
met.ZoneNames = make([]string, len(c.ServerBlockKeys))
copy(met.ZoneNames, c.ServerBlockKeys)
@ -56,26 +57,32 @@ func prometheusParse(c *caddy.Controller) (Metrics, error) {
case 0:
case 1:
met.Addr = args[0]
_, _, e := net.SplitHostPort(met.Addr)
if e != nil {
return met, e
}
default:
return Metrics{}, c.ArgErr()
return met, c.ArgErr()
}
for c.NextBlock() {
switch c.Val() {
case "address":
args = c.RemainingArgs()
if len(args) != 1 {
return Metrics{}, c.ArgErr()
return met, c.ArgErr()
}
met.Addr = args[0]
// expecting something that resembles a host-port
_, _, e := net.SplitHostPort(met.Addr)
if e != nil {
return met, e
}
default:
return Metrics{}, c.Errf("metrics: unknown item: %s", c.Val())
return met, c.Errf("metrics: unknown item: %s", c.Val())
}
}
}
if met.Addr == "" {
met.Addr = addr
}
return met, err
}