From dba556fe4b8562dc236f09de6374c7809a7003ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Thu, 18 Jan 2024 11:02:14 +0100
Subject: [PATCH] refactor: move automaxprocs init in caddycmd.Main()

---
 cmd/caddy/main.go | 10 ----------
 cmd/main.go       |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmd/caddy/main.go b/cmd/caddy/main.go
index e361e3bef..48fa149aa 100644
--- a/cmd/caddy/main.go
+++ b/cmd/caddy/main.go
@@ -29,22 +29,12 @@
 package main
 
 import (
-	"go.uber.org/automaxprocs/maxprocs"
-	"go.uber.org/zap"
-
 	caddycmd "github.com/caddyserver/caddy/v2/cmd"
 
-	"github.com/caddyserver/caddy/v2"
 	// plug in Caddy modules here
 	_ "github.com/caddyserver/caddy/v2/modules/standard"
 )
 
 func main() {
-	undo, err := maxprocs.Set()
-	defer undo()
-	if err != nil {
-		caddy.Log().Warn("failed to set GOMAXPROCS", zap.Error(err))
-	}
-
 	caddycmd.Main()
 }
diff --git a/cmd/main.go b/cmd/main.go
index 73d70f04d..6fd58c62f 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -34,6 +34,7 @@ import (
 
 	"github.com/caddyserver/certmagic"
 	"github.com/spf13/pflag"
+	"go.uber.org/automaxprocs/maxprocs"
 	"go.uber.org/zap"
 
 	"github.com/caddyserver/caddy/v2"
@@ -64,6 +65,12 @@ func Main() {
 		os.Exit(caddy.ExitCodeFailedStartup)
 	}
 
+	undo, err := maxprocs.Set()
+	defer undo()
+	if err != nil {
+		caddy.Log().Warn("failed to set GOMAXPROCS", zap.Error(err))
+	}
+
 	if err := rootCmd.Execute(); err != nil {
 		var exitError *exitError
 		if errors.As(err, &exitError) {