Skip to content

Commit dba556f

Browse files
committed
refactor: move automaxprocs init in caddycmd.Main()
1 parent d9aded0 commit dba556f

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

cmd/caddy/main.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,12 @@
2929
package main
3030

3131
import (
32-
"go.uber.org/automaxprocs/maxprocs"
33-
"go.uber.org/zap"
34-
3532
caddycmd "github.com/caddyserver/caddy/v2/cmd"
3633

37-
"github.com/caddyserver/caddy/v2"
3834
// plug in Caddy modules here
3935
_ "github.com/caddyserver/caddy/v2/modules/standard"
4036
)
4137

4238
func main() {
43-
undo, err := maxprocs.Set()
44-
defer undo()
45-
if err != nil {
46-
caddy.Log().Warn("failed to set GOMAXPROCS", zap.Error(err))
47-
}
48-
4939
caddycmd.Main()
5040
}

cmd/main.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434

3535
"github.com/caddyserver/certmagic"
3636
"github.com/spf13/pflag"
37+
"go.uber.org/automaxprocs/maxprocs"
3738
"go.uber.org/zap"
3839

3940
"github.com/caddyserver/caddy/v2"
@@ -64,6 +65,12 @@ func Main() {
6465
os.Exit(caddy.ExitCodeFailedStartup)
6566
}
6667

68+
undo, err := maxprocs.Set()
69+
defer undo()
70+
if err != nil {
71+
caddy.Log().Warn("failed to set GOMAXPROCS", zap.Error(err))
72+
}
73+
6774
if err := rootCmd.Execute(); err != nil {
6875
var exitError *exitError
6976
if errors.As(err, &exitError) {

0 commit comments

Comments
 (0)