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, 19:30 UTC
cmd: use automaxprocs for better perf in containers (#5711)
* feat: use automaxprocs for better perf in containers * better logs * cs
Kévin Dunglas committed
Dec 18, 2023 at 23:50 UTC
d54dcf1598f87aa1e9757c5d90debf04ae4b1916
3 files changed
+14
cmd/caddy/main.go
+10
@@ -29,12 +29,22 @@
29
package main
30
31
import (
32
+ "go.uber.org/automaxprocs/maxprocs"
33
+ "go.uber.org/zap"
34
+
35
caddycmd "github.com/caddyserver/caddy/v2/cmd"
36
37
+ "github.com/caddyserver/caddy/v2"
38
// plug in Caddy modules here
39
_ "github.com/caddyserver/caddy/v2/modules/standard"
40
)
41
42
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
+
49
caddycmd.Main()
50
}
go.mod
+1
@@ -31,6 +31,7 @@ require (
31
go.opentelemetry.io/otel v1.21.0
32
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
33
go.opentelemetry.io/otel/sdk v1.21.0
34
+ go.uber.org/automaxprocs v1.5.3
35
go.uber.org/zap v1.25.0
36
golang.org/x/crypto v0.16.0
37
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611
go.sum
+3
@@ -440,6 +440,7 @@ github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6J
440
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
441
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
442
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
443
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
444
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
445
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
446
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -625,6 +626,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
626
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
627
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
628
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
629
+go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
630
+go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
631
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
632
go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
633
go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=