Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 18:15 UTC
refactor: move automaxprocs init in caddycmd.Main()
Kévin Dunglas committed
Jan 18, 2024 at 11:02 UTC
dba556fe4b8562dc236f09de6374c7809a7003ee
2 files changed
+7
-10
cmd/caddy/main.go
-10
@@ -29,22 +29,12 @@
29
package main
30
31
import (
32
- "go.uber.org/automaxprocs/maxprocs"
33
- "go.uber.org/zap"
34
-
32
caddycmd "github.com/caddyserver/caddy/v2/cmd"
33
37
- "github.com/caddyserver/caddy/v2"
34
// plug in Caddy modules here
35
_ "github.com/caddyserver/caddy/v2/modules/standard"
36
)
37
38
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
-
39
caddycmd.Main()
40
}
cmd/main.go
+7
@@ -34,6 +34,7 @@ import (
34
35
"github.com/caddyserver/certmagic"
36
"github.com/spf13/pflag"
37
+ "go.uber.org/automaxprocs/maxprocs"
38
"go.uber.org/zap"
39
40
"github.com/caddyserver/caddy/v2"
@@ -64,6 +65,12 @@ func Main() {
65
os.Exit(caddy.ExitCodeFailedStartup)
66
}
67
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
+
74
if err := rootCmd.Execute(); err != nil {
75
var exitError *exitError
76
if errors.As(err, &exitError) {