Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/grpc/setup.go
View File

@@ -11,7 +11,6 @@ import (
pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
func init() { plugin.Register("grpc", setup) }
@@ -50,7 +49,7 @@ func parseGRPC(c *caddy.Controller) (*GRPC, error) {
return nil, plugin.ErrOnce
}
i++
g, err = parseGRPCStanza(&c.Dispenser)
g, err = parseStanza(c)
if err != nil {
return nil, err
}
@@ -58,7 +57,7 @@ func parseGRPC(c *caddy.Controller) (*GRPC, error) {
return g, nil
}
func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) {
func parseStanza(c *caddy.Controller) (*GRPC, error) {
g := newGRPC()
if !c.Args(&g.from) {
@@ -99,7 +98,7 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) {
return g, nil
}
func parseBlock(c *caddyfile.Dispenser, g *GRPC) error {
func parseBlock(c *caddy.Controller, g *GRPC) error {
switch c.Val() {
case "except":