summaryrefslogtreecommitdiffhomepage
path: root/context.go
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2019-07-07 14:12:22 -0600
committerMatthew Holt <[email protected]>2019-07-07 14:12:22 -0600
commit42acdad9e541192185fe2ce64e72430ab032ca16 (patch)
tree01a810e4e60b5d66acd9f967536f094824ceec16 /context.go
parent84f9f7cd606146f1a1d6717d369fc98509365de6 (diff)
downloadcaddy-42acdad9e541192185fe2ce64e72430ab032ca16.tar.gz
caddy-42acdad9e541192185fe2ce64e72430ab032ca16.zip
Fix error handling with Validate when loading modules (fixes #2658)
The return statement was improperly nested in context.go
Diffstat (limited to 'context.go')
-rw-r--r--context.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/context.go b/context.go
index ea4f8a325..17488e403 100644
--- a/context.go
+++ b/context.go
@@ -138,8 +138,8 @@ func (ctx Context) LoadModule(name string, rawMsg json.RawMessage) (interface{},
if err2 != nil {
err = fmt.Errorf("%v; additionally, cleanup: %v", err, err2)
}
- return nil, fmt.Errorf("%s: invalid configuration: %v", mod.Name, err)
}
+ return nil, fmt.Errorf("%s: invalid configuration: %v", mod.Name, err)
}
}