Commit 6b66b19d authored by Matt Holt's avatar Matt Holt Committed by GitHub

Merge pull request #1583 from tw4452852/1529

log: only allow new roller related options in a block
parents 33257de2 702dec06
......@@ -41,12 +41,13 @@ func logParse(c *caddy.Controller) ([]*Rule, error) {
}
where := c.Val()
if httpserver.IsLogRollerSubdirective(what) {
var err error
err = httpserver.ParseRoller(logRoller, what, where)
if err != nil {
return nil, err
}
// only support roller related options inside a block
if !httpserver.IsLogRollerSubdirective(what) {
return nil, c.ArgErr()
}
if err := httpserver.ParseRoller(logRoller, what, where); err != nil {
return nil, err
}
}
......
......@@ -205,6 +205,8 @@ func TestLogParse(t *testing.T) {
Format: "{when}",
}},
}}},
{`log access.log { rotate_size }`, true, nil},
{`log access.log { invalid_option 1 }`, true, nil},
}
for i, test := range tests {
c := caddy.NewTestController("http", test.inputLogRules)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment