return an error for multiple use of some plugins (#1559)
* plugins: Return error for multiple use of some Return plugin.ErrOnce when a plugin that doesn't support it, is called mutliple times. This now adds it for: cache, dnssec, errors, forward, hosts, nsid. And changes it slightly in kubernetes, pprof, reload, root. * more tests
This commit is contained in:
parent
5faa9e7bc1
commit
f697b33283
27 changed files with 150 additions and 95 deletions
10
plugin/cache/setup.go
vendored
10
plugin/cache/setup.go
vendored
|
@ -61,7 +61,13 @@ func setup(c *caddy.Controller) error {
|
|||
func cacheParse(c *caddy.Controller) (*Cache, error) {
|
||||
ca := New()
|
||||
|
||||
j := 0
|
||||
for c.Next() {
|
||||
if j > 0 {
|
||||
return nil, plugin.ErrOnce
|
||||
}
|
||||
j++
|
||||
|
||||
// cache [ttl] [zones..]
|
||||
origins := make([]string, len(c.ServerBlockKeys))
|
||||
copy(origins, c.ServerBlockKeys)
|
||||
|
@ -180,9 +186,7 @@ func cacheParse(c *caddy.Controller) (*Cache, error) {
|
|||
|
||||
ca.pcache = cache.New(ca.pcap)
|
||||
ca.ncache = cache.New(ca.ncap)
|
||||
|
||||
return ca, nil
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
return ca, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue