Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

logging: Default logger should use wall time with milliseconds

Browse source 
This format is easier for humans to read and is still very precise.
This commit is contained in:
Matthew Holt 2019-11-04 12:14:22 -07:00
parent 6011ce120a
commit b1f41d0ff1
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
logging.go
View file

@ -337,7 +337,7 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error {
cl.encoder = val.(zapcore.Encoder)
}
if cl.encoder == nil {
cl.encoder = zapcore.NewConsoleEncoder(zap.NewProductionEncoderConfig())
cl.encoder = newDefaultProductionLogEncoder()
}
if cl.WriterRaw != nil {
@ -576,9 +576,7 @@ func newDefaultProductionLog() (*defaultCustomLog, error) {
if err != nil {
return nil, err
}
encCfg := zap.NewProductionEncoderConfig()
encCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
cl.encoder = zapcore.NewConsoleEncoder(encCfg)
cl.encoder = newDefaultProductionLogEncoder()
cl.levelEnabler = zapcore.InfoLevel
cl.buildCore()
@ -589,6 +587,15 @@ func newDefaultProductionLog() (*defaultCustomLog, error) {
}, nil
}
func newDefaultProductionLogEncoder() zapcore.Encoder {
encCfg := zap.NewProductionEncoderConfig()
encCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
encCfg.EncodeTime = func(ts time.Time, encoder zapcore.PrimitiveArrayEncoder) {
encoder.AppendString(ts.UTC().Format("2006/01/02 15:04:05.000"))
}
return zapcore.NewConsoleEncoder(encCfg)
}
// Log returns the current default logger.
func Log() *zap.Logger {
defaultLoggerMu.RLock()