summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-10-29 11:58:29 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-10-29 11:58:29 -0600
commitc4c45f8e01bd59b556eaa84f4d6c6ec529e01acb (patch)
treec5b51f3ca78a947b51b040641fed906d180a5682
parent54e458b756cf2cdb8adb750e822ead8e3a973441 (diff)
logging: Tweak defaults (enable logging by default, color level enc.)
-rw-r--r--caddy.go11
-rw-r--r--logging.go1
2 files changed, 7 insertions, 5 deletions
diff --git a/caddy.go b/caddy.go
index dd241ee..33e6296 100644
--- a/caddy.go
+++ b/caddy.go
@@ -119,11 +119,12 @@ func run(newCfg *Config, start bool) error {
newCfg.cancelFunc = cancel // clean up later
// set up logging before anything bad happens
- if newCfg.Logging != nil {
- err := newCfg.Logging.openLogs(ctx)
- if err != nil {
- return err
- }
+ if newCfg.Logging == nil {
+ newCfg.Logging = new(Logging)
+ }
+ err = newCfg.Logging.openLogs(ctx)
+ if err != nil {
+ return err
}
// set up global storage and make it CertMagic's default storage, too
diff --git a/logging.go b/logging.go
index a70a7ea..c29a0fa 100644
--- a/logging.go
+++ b/logging.go
@@ -577,6 +577,7 @@ func newDefaultProductionLog() (*defaultCustomLog, error) {
return nil, err
}
encCfg := zap.NewProductionEncoderConfig()
+ encCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
cl.encoder = zapcore.NewConsoleEncoder(encCfg)
cl.levelEnabler = zapcore.InfoLevel