From eadd8c2482e9fffe0d320b74aee74258b00012e6 Mon Sep 17 00:00:00 2001
From: Travis Groth <travisgroth@users.noreply.github.com>
Date: Tue, 12 Jan 2021 10:33:33 -0500
Subject: [PATCH] autocert: improve logging (#1767)

---
 internal/autocert/manager.go      | 10 +++++++---
 internal/cmd/pomerium/pomerium.go |  4 ++--
 internal/log/log.go               |  4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/internal/autocert/manager.go b/internal/autocert/manager.go
index 868e4490c..e0e238341 100644
--- a/internal/autocert/manager.go
+++ b/internal/autocert/manager.go
@@ -48,17 +48,21 @@ func newManager(ctx context.Context,
 	acmeTemplate certmagic.ACMEManager,
 	checkInterval time.Duration,
 ) (*Manager, error) {
+	certmagicConfig := certmagic.NewDefault()
 	// set certmagic default storage cache, otherwise cert renewal loop will be based off
 	// certmagic's own default location
-	certmagic.Default.Storage = &certmagic.FileStorage{
+	certmagicConfig.Storage = &certmagic.FileStorage{
 		Path: src.GetConfig().Options.AutocertOptions.Folder,
 	}
-	certmagic.Default.Logger = log.ZapLogger().With(zap.String("service", "autocert"))
+
+	logger := log.ZapLogger().With(zap.String("service", "autocert"))
+	certmagicConfig.Logger = logger
+	acmeTemplate.Logger = logger
 
 	mgr := &Manager{
 		src:          src,
 		acmeTemplate: acmeTemplate,
-		certmagic:    certmagic.NewDefault(),
+		certmagic:    certmagicConfig,
 	}
 	err := mgr.update(src.GetConfig())
 	if err != nil {
diff --git a/internal/cmd/pomerium/pomerium.go b/internal/cmd/pomerium/pomerium.go
index 5ac03a361..b297b30f2 100644
--- a/internal/cmd/pomerium/pomerium.go
+++ b/internal/cmd/pomerium/pomerium.go
@@ -40,6 +40,8 @@ func Run(ctx context.Context, configFile string) error {
 	}
 
 	src = databroker.NewConfigSource(src)
+	logMgr := config.NewLogManager(src)
+	defer logMgr.Close()
 
 	src, err = autocert.New(src)
 	if err != nil {
@@ -49,8 +51,6 @@ func Run(ctx context.Context, configFile string) error {
 	// override the default http transport so we can use the custom CA in the TLS client config (#1570)
 	http.DefaultTransport = config.NewHTTPTransport(src)
 
-	logMgr := config.NewLogManager(src)
-	defer logMgr.Close()
 	metricsMgr := config.NewMetricsManager(src)
 	defer metricsMgr.Close()
 	traceMgr := config.NewTraceManager(src)
diff --git a/internal/log/log.go b/internal/log/log.go
index 7730e839c..ab039b115 100644
--- a/internal/log/log.go
+++ b/internal/log/log.go
@@ -69,12 +69,16 @@ func SetLevel(level string) {
 	switch level {
 	case "info":
 		zerolog.SetGlobalLevel(zerolog.InfoLevel)
+		zapLevel.SetLevel(zapcore.InfoLevel)
 	case "warn":
 		zerolog.SetGlobalLevel(zerolog.WarnLevel)
+		zapLevel.SetLevel(zapcore.WarnLevel)
 	case "error":
 		zerolog.SetGlobalLevel(zerolog.ErrorLevel)
+		zapLevel.SetLevel(zapcore.ErrorLevel)
 	default:
 		zerolog.SetGlobalLevel(zerolog.DebugLevel)
+		zapLevel.SetLevel(zapcore.DebugLevel)
 	}
 }