Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Merge pull request #1583 from tw4452852/1529

Browse source 
log: only allow new roller related options in a block
This commit is contained in:
Matt Holt 2017-04-17 10:01:15 -06:00 committed by GitHub
commit 6b66b19deb
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
caddyhttp/log/setup.go
View file

@ -41,12 +41,13 @@ func logParse(c *caddy.Controller) ([]*Rule, error) {
} }
where := c.Val() where := c.Val()
if httpserver.IsLogRollerSubdirective(what) { // only support roller related options inside a block
var err error if !httpserver.IsLogRollerSubdirective(what) {
err = httpserver.ParseRoller(logRoller, what, where) return nil, c.ArgErr()
if err != nil {
return nil, err
} }
if err := httpserver.ParseRoller(logRoller, what, where); err != nil {
return nil, err
} }
} }

2
caddyhttp/log/setup_test.go
View file

@ -205,6 +205,8 @@ func TestLogParse(t *testing.T) {
Format: "{when}", Format: "{when}",
}}, }},
}}}, }}},
{`log access.log { rotate_size }`, true, nil},
{`log access.log { invalid_option 1 }`, true, nil},
} }
for i, test := range tests { for i, test := range tests {
c := caddy.NewTestController("http", test.inputLogRules) c := caddy.NewTestController("http", test.inputLogRules)