core: hide registerHandler (#964)

* core: hide registerHandler

Remove RegisterHandler and just make it implicit when we look at the
handler compilation step.

* Rename GetHandler to just Handler

Update callers and make auto check Hander in OnStartup.

* Up test coverage in erratic

* up test coverage
This commit is contained in:
Miek Gieben
2017-08-22 14:21:42 +01:00
committed by GitHub
parent 65009b5578
commit 8931ede142
11 changed files with 41 additions and 45 deletions

View File

@@ -38,9 +38,6 @@ func setup(c *caddy.Controller) error {
}
c.OnFinalShutdown(m.OnShutdown)
// Also register metrics for use in other middleware.
dnsserver.GetConfig(c).RegisterHandler(m)
return nil
}
@@ -75,24 +72,6 @@ func prometheusParse(c *caddy.Controller) (*Metrics, error) {
default:
return met, c.ArgErr()
}
for c.NextBlock() {
switch c.Val() {
case "address":
args = c.RemainingArgs()
if len(args) != 1 {
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 met, c.Errf("unknown property: %s", c.Val())
}
}
}
return met, err
}