serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-18 16:55:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow nil middleware to be returned

Browse source 
In case a middleware actually just wants some code to execute at startup... will expand on that idea later.
This commit is contained in:
Matthew Holt 2015-01-29 23:09:14 -07:00
parent 8471c2d9d8
commit ba88be0fe9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/dispenser.go
View file

@ -8,12 +8,14 @@ import (
// dispenser is a type that gets exposed to middleware // dispenser is a type that gets exposed to middleware
// generators so that they can parse tokens to configure // generators so that they can parse tokens to configure
// their instance. // their instance.
// TODO: Rename this; it does more than dispense tokens.
// It also provides access to the server to touch its
// configuration.
type dispenser struct { type dispenser struct {
parser *parser parser *parser
cursor int cursor int
nesting int nesting int
tokens []token tokens []token
//err error
} }
// newDispenser returns a new dispenser. // newDispenser returns a new dispenser.

4
config/parser.go
View file

@ -113,7 +113,9 @@ func (p *parser) unwrap() error {
if err != nil { if err != nil {
return err return err
} }
p.cfg.Middleware = append(p.cfg.Middleware, mid) if mid != nil {
p.cfg.Middleware = append(p.cfg.Middleware, mid)
}
} else { } else {
return errors.New("No middleware bound to directive '" + directive + "'") return errors.New("No middleware bound to directive '" + directive + "'")
} }