From 3017b245c9275f910dff472ee5e7729625c4f913 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Thu, 28 Apr 2022 10:42:30 -0400 Subject: [PATCH] logging: Use `RedirectStdLog` to capture more stdlib logs (#4732) * logging: Use `RedirectStdLog` * .gitignore a file pattern that I'm constantly using for testing --- .gitignore | 1 + logging.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5322a53f0..e154526b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ _gitignore/ *.log Caddyfile +Caddyfile.* !caddyfile/ # artifacts from pprof tooling diff --git a/logging.go b/logging.go index 129aec430..5f8ea06a9 100644 --- a/logging.go +++ b/logging.go @@ -661,9 +661,15 @@ func newDefaultProductionLog() (*defaultCustomLog, error) { cl.buildCore() + logger := zap.New(cl.core) + + // capture logs from other libraries which + // may not be using zap logging directly + _ = zap.RedirectStdLog(logger) + return &defaultCustomLog{ CustomLog: cl, - logger: zap.New(cl.core), + logger: logger, }, nil }