plugin/bind: tweak error messages (#4532)

When the interface doesn't exist you get:

plugin/bind: not a valid IP address: eth0

Fix the wording that this can also be interface name. Also %q the
argument in the error mesg.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2021-03-18 15:39:40 +01:00
committed by GitHub
parent deb09c8905
commit 8faca26873

View File

@@ -33,7 +33,7 @@ func setup(c *caddy.Controller) error {
isIface = true isIface = true
addrs, err := iface.Addrs() addrs, err := iface.Addrs()
if err != nil { if err != nil {
return plugin.Error("bind", fmt.Errorf("failed to get the IP(s) of the interface: %s", arg)) return plugin.Error("bind", fmt.Errorf("failed to get the IP addresses of the interface: %q", arg))
} }
for _, addr := range addrs { for _, addr := range addrs {
if ipnet, ok := addr.(*net.IPNet); ok { if ipnet, ok := addr.(*net.IPNet); ok {
@@ -46,7 +46,7 @@ func setup(c *caddy.Controller) error {
} }
if !isIface { if !isIface {
if net.ParseIP(arg) == nil { if net.ParseIP(arg) == nil {
return plugin.Error("bind", fmt.Errorf("not a valid IP address: %s", arg)) return plugin.Error("bind", fmt.Errorf("not a valid IP address or interface name: %q", arg))
} }
all = append(all, arg) all = append(all, arg)
} }