just use setup (#1574)

All these functions are namespaced by their package anyway; just use
setup().
This commit is contained in:
Miek Gieben
2018-02-28 19:56:14 -08:00
committed by GitHub
parent 4f3dc207a4
commit 654b88d8c4
9 changed files with 18 additions and 18 deletions

View File

@@ -14,11 +14,11 @@ import (
func init() {
caddy.RegisterPlugin("erratic", caddy.Plugin{
ServerType: "dns",
Action: setupErratic,
Action: setup,
})
}
func setupErratic(c *caddy.Controller) error {
func setup(c *caddy.Controller) error {
e, err := parseErratic(c)
if err != nil {
return plugin.Error("erratic", err)

View File

@@ -6,23 +6,23 @@ import (
"github.com/mholt/caddy"
)
func TestSetupErratic(t *testing.T) {
func TestSetup(t *testing.T) {
c := caddy.NewTestController("dns", `erratic {
drop
}`)
if err := setupErratic(c); err != nil {
if err := setup(c); err != nil {
t.Fatalf("Test 1, expected no errors, but got: %q", err)
}
c = caddy.NewTestController("dns", `erratic`)
if err := setupErratic(c); err != nil {
if err := setup(c); err != nil {
t.Fatalf("Test 2, expected no errors, but got: %q", err)
}
c = caddy.NewTestController("dns", `erratic {
drop -1
}`)
if err := setupErratic(c); err == nil {
if err := setup(c); err == nil {
t.Fatalf("Test 4, expected errors, but got: %q", err)
}
}