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

logging: Tweak defaults (enable logging by default, color level enc.)

Browse source
This commit is contained in:
Matthew Holt 2019-10-29 11:58:29 -06:00
parent 54e458b756
commit c4c45f8e01
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
caddy.go
View file

@ -119,12 +119,13 @@ func run(newCfg *Config, start bool) error {
newCfg.cancelFunc = cancel // clean up later newCfg.cancelFunc = cancel // clean up later
// set up logging before anything bad happens // set up logging before anything bad happens
if newCfg.Logging != nil { if newCfg.Logging == nil {
err := newCfg.Logging.openLogs(ctx) newCfg.Logging = new(Logging)
}
err = newCfg.Logging.openLogs(ctx)
if err != nil { if err != nil {
return err return err
} }
}
// set up global storage and make it CertMagic's default storage, too // set up global storage and make it CertMagic's default storage, too
err = func() error { err = func() error {

1
logging.go
View file

@ -577,6 +577,7 @@ func newDefaultProductionLog() (*defaultCustomLog, error) {
return nil, err return nil, err
} }
encCfg := zap.NewProductionEncoderConfig() encCfg := zap.NewProductionEncoderConfig()
encCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
cl.encoder = zapcore.NewConsoleEncoder(encCfg) cl.encoder = zapcore.NewConsoleEncoder(encCfg)
cl.levelEnabler = zapcore.InfoLevel cl.levelEnabler = zapcore.InfoLevel