mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-26 21:53:48 +03:00
logging: Tweak defaults (enable logging by default, color level enc.)
This commit is contained in:
parent
54e458b756
commit
c4c45f8e01
2 changed files with 7 additions and 5 deletions
11
caddy.go
11
caddy.go
|
@ -119,11 +119,12 @@ 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)
|
||||||
if err != nil {
|
}
|
||||||
return err
|
err = newCfg.Logging.openLogs(ctx)
|
||||||
}
|
if err != nil {
|
||||||
|
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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue