From 3ac0042c9a7449a416ea6110ea9818db9028fa6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 20 Dec 2023 18:47:49 +0100 Subject: [PATCH] chore: sync automaxprocs logging with upstream Caddy --- caddy/mercure/main.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/caddy/mercure/main.go b/caddy/mercure/main.go index 28da0ce9..fba57edb 100644 --- a/caddy/mercure/main.go +++ b/caddy/mercure/main.go @@ -6,18 +6,19 @@ import ( caddycmd "github.com/caddyserver/caddy/v2/cmd" "go.uber.org/automaxprocs/maxprocs" + "go.uber.org/zap" // plug in Caddy modules here. _ "github.com/caddyserver/caddy/v2/modules/standard" _ "github.com/dunglas/mercure/caddy" ) -//nolint:gochecknoinits -func init() { - //nolint:errcheck - maxprocs.Set(maxprocs.Logger(caddy.Log().Sugar().Debugf)) -} - func main() { + undo, err := maxprocs.Set() + defer undo() + if err != nil { + caddy.Log().Warn("failed to set GOMAXPROCS", zap.Error(err)) + } + caddycmd.Main() }