serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: Add roll_local_time Caddyfile option (#4583)

Browse source
This commit is contained in:
Francis Lavoie 2022-02-19 17:12:28 -05:00 committed by GitHub
parent ddbb234d91
commit c921e08296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddytest/integration/caddyfile_adapt/log_roll_days.txt
View file

@ -4,6 +4,7 @@ log {
output file /var/log/access.log { output file /var/log/access.log {
roll_size 1gb roll_size 1gb
roll_uncompressed roll_uncompressed
roll_local_time
roll_keep 5 roll_keep 5
roll_keep_for 90d roll_keep_for 90d
} }
@ -24,6 +25,7 @@ log {
"roll_gzip": false, "roll_gzip": false,
"roll_keep": 5, "roll_keep": 5,
"roll_keep_days": 90, "roll_keep_days": 90,
"roll_local_time": true,
"roll_size_mb": 954 "roll_size_mb": 954
}, },
"include": [ "include": [

7
modules/logging/filewriter.go
View file

@ -135,6 +135,7 @@ func (fw FileWriter) OpenWriter() (io.WriteCloser, error) {
// roll_disabled // roll_disabled
// roll_size <size> // roll_size <size>
// roll_uncompressed // roll_uncompressed
// roll_local_time
// roll_keep <num> // roll_keep <num>
// roll_keep_for <days> // roll_keep_for <days>
// } // }
@ -188,6 +189,12 @@ func (fw *FileWriter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return d.ArgErr() return d.ArgErr()
} }
case "roll_local_time":
fw.RollLocalTime = true
if d.NextArg() {
return d.ArgErr()
}
case "roll_keep": case "roll_keep":
var keepStr string var keepStr string
if !d.AllArgs(&keepStr) { if !d.AllArgs(&keepStr) {