From 42acdad9e541192185fe2ce64e72430ab032ca16 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Sun, 7 Jul 2019 14:12:22 -0600 Subject: Fix error handling with Validate when loading modules (fixes #2658) The return statement was improperly nested in context.go --- modules/caddyhttp/caddyhttp.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules/caddyhttp/caddyhttp.go') diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go index 7d30178..3277e42 100644 --- a/modules/caddyhttp/caddyhttp.go +++ b/modules/caddyhttp/caddyhttp.go @@ -102,7 +102,7 @@ func (app *App) Validate() error { } for _, a := range expanded { if sn, ok := lnAddrs[netw+a]; ok { - return fmt.Errorf("listener address repeated: %s (already claimed by server '%s')", a, sn) + return fmt.Errorf("server %s: listener address repeated: %s (already claimed by server '%s')", srvName, a, sn) } lnAddrs[netw+a] = srvName } @@ -486,5 +486,9 @@ const ( DefaultHTTPSPort = 443 ) -// Interface guard -var _ caddy.App = (*App)(nil) +// Interface guards +var ( + _ caddy.App = (*App)(nil) + _ caddy.Provisioner = (*App)(nil) + _ caddy.Validator = (*App)(nil) +) -- cgit v1.2.3