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

logging: support ms duration format and add docs (#6187)

Browse source
This commit is contained in:
Mohammed Al Sahaf 2024-03-22 05:17:09 +03:00 committed by GitHub
parent e7336cc3bf
commit 0c01547037
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
modules/logging/encoders.go
View file

@ -118,17 +118,26 @@ func (je *JSONEncoder) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
// LogEncoderConfig holds configuration common to most encoders. // LogEncoderConfig holds configuration common to most encoders.
type LogEncoderConfig struct { type LogEncoderConfig struct {
MessageKey *string `json:"message_key,omitempty"` MessageKey *string `json:"message_key,omitempty"`
LevelKey *string `json:"level_key,omitempty"` LevelKey *string `json:"level_key,omitempty"`
TimeKey *string `json:"time_key,omitempty"` TimeKey *string `json:"time_key,omitempty"`
NameKey *string `json:"name_key,omitempty"` NameKey *string `json:"name_key,omitempty"`
CallerKey *string `json:"caller_key,omitempty"` CallerKey *string `json:"caller_key,omitempty"`
StacktraceKey *string `json:"stacktrace_key,omitempty"` StacktraceKey *string `json:"stacktrace_key,omitempty"`
LineEnding *string `json:"line_ending,omitempty"` LineEnding *string `json:"line_ending,omitempty"`
TimeFormat string `json:"time_format,omitempty"`
TimeLocal bool `json:"time_local,omitempty"` // Recognized values are: unix_seconds_float, unix_milli_float, unix_nano, iso8601, rfc3339, rfc3339_nano, wall, wall_milli, wall_nano, common_log.
DurationFormat string `json:"duration_format,omitempty"` // The value may also be custom format per the Go `time` package layout specification, as described [here](https://pkg.go.dev/time#pkg-constants).
LevelFormat string `json:"level_format,omitempty"` TimeFormat string `json:"time_format,omitempty"`
TimeLocal bool `json:"time_local,omitempty"`
// Recognized values are: s/second/seconds, ns/nano/nanos, ms/milli/millis, string.
// Empty and unrecognized value default to seconds.
DurationFormat string `json:"duration_format,omitempty"`
// Recognized values are: lower, upper, color.
// Empty and unrecognized value default to lower.
LevelFormat string `json:"level_format,omitempty"`
} }
// UnmarshalCaddyfile populates the struct from Caddyfile tokens. Syntax: // UnmarshalCaddyfile populates the struct from Caddyfile tokens. Syntax:
@ -260,12 +269,16 @@ func (lec *LogEncoderConfig) ZapcoreEncoderConfig() zapcore.EncoderConfig {
// duration format // duration format
var durFormatter zapcore.DurationEncoder var durFormatter zapcore.DurationEncoder
switch lec.DurationFormat { switch lec.DurationFormat {
case "", "seconds": case "s", "second", "seconds":
durFormatter = zapcore.SecondsDurationEncoder durFormatter = zapcore.SecondsDurationEncoder
case "nano": case "ns", "nano", "nanos":
durFormatter = zapcore.NanosDurationEncoder durFormatter = zapcore.NanosDurationEncoder
case "ms", "milli", "millis":
durFormatter = zapcore.MillisDurationEncoder
case "string": case "string":
durFormatter = zapcore.StringDurationEncoder durFormatter = zapcore.StringDurationEncoder
default:
durFormatter = zapcore.SecondsDurationEncoder
} }
cfg.EncodeDuration = durFormatter cfg.EncodeDuration = durFormatter