plugins: calling Dispenser itself is a mistake (#3323)

Remove all these uses and just make them work on caddy.Controller. Also
don't export parsing functions as their should be private to the plugin.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-09-28 10:41:12 +01:00 committed by GitHub
parent ba5d4a6372
commit 03a3695ea9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions

View file

@ -10,7 +10,6 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
var log = clog.NewWithPlugin("dnstap")
@ -30,7 +29,7 @@ type config struct {
full bool
}
func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
func parseConfig(d *caddy.Controller) (c config, err error) {
d.Next() // directive name
if !d.Args(&c.target) {
@ -56,7 +55,7 @@ func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
}
func setup(c *caddy.Controller) error {
conf, err := parseConfig(&c.Dispenser)
conf, err := parseConfig(c)
if err != nil {
return err
}