Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-30 18:22:49 -04:00
Code Issues Actions 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
No known key found for this signature in database
GPG Key ID: 0D97CC73664F4D03
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caddy.go
View File

@ -455,7 +455,7 @@ func startWithListenerFds(cdyfile Input, inst *Instance, restartFds map[string]r
return err return err
} }
err = executeDirectives(inst, cdyfile.Path(), stype.Directives, sblocks) err = executeDirectives(inst, cdyfile.Path(), stype.Directives(), sblocks)
if err != nil { if err != nil {
return err return err
} }

2
caddyhttp/httpserver/plugin.go
View File

@ -26,7 +26,7 @@ func init() {
flag.BoolVar(&QUIC, "quic", false, "Use experimental QUIC") flag.BoolVar(&QUIC, "quic", false, "Use experimental QUIC")
caddy.RegisterServerType(serverType, caddy.ServerType{ caddy.RegisterServerType(serverType, caddy.ServerType{
Directives: directives, Directives: func() []string { return directives },
DefaultInput: func() caddy.Input { DefaultInput: func() caddy.Input {
if Port == DefaultPort && Host != "" { if Port == DefaultPort && Host != "" {
// by leaving the port blank in this case we give auto HTTPS // by leaving the port blank in this case we give auto HTTPS

11
plugins.go
View File

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