Merge pull request #6159 from TheThingsNetwork/fix/avoid-automaxprocs…

…-logs Avoid automaxprocs logs
TheThingsNetwork · Apr 14, 2023 · 895c886 · 895c886
2 parents bcbda8a + c3059f4
commit 895c886
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmd/internal/shared/init.go b/cmd/internal/shared/init.go
@@ -19,8 +19,6 @@ import (
 
 	"go.thethings.network/lorawan-stack/v3/pkg/config"
 	"go.thethings.network/lorawan-stack/v3/pkg/log"
-
-	_ "go.uber.org/automaxprocs" // Automatically set `GOMAXPROCS` in derived commands.
 )
 
 // InitializeFallbacks initializes configuration fallbacks.

diff --git a/cmd/ttn-lw-stack/commands/root.go b/cmd/ttn-lw-stack/commands/root.go
@@ -32,6 +32,7 @@ import (
 	logobservability "go.thethings.network/lorawan-stack/v3/pkg/log/middleware/observability"
 	logsentry "go.thethings.network/lorawan-stack/v3/pkg/log/middleware/sentry"
 	pkgversion "go.thethings.network/lorawan-stack/v3/pkg/version"
+	"go.uber.org/automaxprocs/maxprocs"
 )
 
 var errMissingFlag = errors.DefineInvalidArgument("missing_flag", "missing CLI flag `{flag}`")
@@ -105,6 +106,10 @@ var (
 				logger.Use(logsentry.New())
 			}
 
+			if _, err := maxprocs.Set(); err != nil {
+				logger.WithError(err).Debug("Failed to set GOMAXPROCS")
+			}
+
 			ctx = log.NewContext(ctx, logger)
 
 			// check version in background