summaryrefslogtreecommitdiffhomepage
path: root/caddy.go
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2017-01-23 23:48:12 -0700
committerMatthew Holt <[email protected]>2017-01-23 23:48:12 -0700
commit205aee6662a0090b1a3f6046725c9718f28bd8d4 (patch)
tree82e1fcc0ff06c07a1be3e5265de5b4e65c74eaa1 /caddy.go
parent62fea30e878b571136fd9a02dd11edee69f6e2a6 (diff)
downloadcaddy-205aee6662a0090b1a3f6046725c9718f28bd8d4.tar.gz
caddy-205aee6662a0090b1a3f6046725c9718f28bd8d4.zip
Godoc comment; report -validate results to stdout too
Diffstat (limited to 'caddy.go')
-rw-r--r--caddy.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/caddy.go b/caddy.go
index 7a80d1763..b55c302f3 100644
--- a/caddy.go
+++ b/caddy.go
@@ -492,6 +492,11 @@ func startWithListenerFds(cdyfile Input, inst *Instance, restartFds map[string]r
return nil
}
+// ValidateAndExecuteDirectives will load the server blocks from cdyfile
+// by parsing it, then execute the directives configured by it and store
+// the resulting server blocks into inst. If justValidate is true, parse
+// callbacks will not be executed between directives, since the purpose
+// is only to check the input for valid syntax.
func ValidateAndExecuteDirectives(cdyfile Input, inst *Instance, justValidate bool) error {
// If parsing only inst will be nil, create an instance for this function call only.