github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-07 05:21:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Defer loading directives until needed (fix for previous commit)

Browse Source 
This change is still experimental.
This commit is contained in:
Matthew Holt
2016-08-25 00:15:18 -06:00
parent 5a691fbaf5
commit 17709a7d3f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins.go
View File

@ -79,7 +79,7 @@ func ValidDirectives(serverType string) []string {
if err != nil {
return nil
}
return stype.Directives
return stype.Directives()
}
// ServerListener pairs a server to its listener and/or packetconn.
@ -145,10 +145,11 @@ func RegisterServerType(typeName string, srv ServerType) {
// ServerType contains information about a server type.
type ServerType struct {
// List of directives, in execution order, that are
// valid for this server type. Directives should be
// one word if possible and lower-cased.
Directives []string
// Function that returns the list of directives, in
// execution order, that are valid for this server
// type. Directives should be one word if possible
// and lower-cased.
Directives func() []string
// DefaultInput returns a default config input if none
// is otherwise loaded. This is optional, but highly