Skip to content

Commit

Permalink
refactor: move automaxprocs init in caddycmd.Main()
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Jan 19, 2024
1 parent d9aded0 commit dba556f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
10 changes: 0 additions & 10 deletions cmd/caddy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
7 changes: 7 additions & 0 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit dba556f

Please sign in to comment.