Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: disable automaxprocs logging #20069

Merged
merged 7 commits into from
Oct 9, 2024
Merged

fix: disable automaxprocs logging #20069

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a592ca2
disable automaxprocs logging
nitishfy Sep 24, 2024
abbcd79
add info log
nitishfy Oct 3, 2024
7e631da
fix lint checks
nitishfy Oct 3, 2024
cd79ca0
Merge branch 'master' into fix-maxprocs
nitishfy Oct 3, 2024
8233dc4
fix lint checks
nitishfy Oct 3, 2024
23d0fd6
add unit test
nitishfy Oct 8, 2024
9c23436
fix lint issues
nitishfy Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"os"
"path/filepath"

"github.com/spf13/cobra"
log "github.com/sirupsen/logrus"
"go.uber.org/automaxprocs/maxprocs"

_ "go.uber.org/automaxprocs"
"github.com/spf13/cobra"

nitishfy marked this conversation as resolved.
Show resolved Hide resolved
appcontroller "github.com/argoproj/argo-cd/v2/cmd/argocd-application-controller/commands"
applicationset "github.com/argoproj/argo-cd/v2/cmd/argocd-applicationset-controller/commands"
Expand All @@ -31,6 +32,8 @@ func main() {
if val := os.Getenv(binaryNameEnv); val != "" {
binaryName = val
}
setAutoMaxProcs(binaryName)

switch binaryName {
case "argocd", "argocd-linux-amd64", "argocd-darwin-amd64", "argocd-windows-amd64.exe":
command = cli.NewCommand()
Expand Down Expand Up @@ -60,3 +63,21 @@ func main() {
os.Exit(1)
}
}

// setAutoMaxProcs sets the GOMAXPROCS value based on the binary name.
// It suppresses logs for CLI binaries and logs the setting for services.
func setAutoMaxProcs(binaryName string) {
isCLI := binaryName == "argocd" ||
nitishfy marked this conversation as resolved.
Show resolved Hide resolved
binaryName == "argocd-linux-amd64" ||
binaryName == "argocd-darwin-amd64" ||
binaryName == "argocd-windows-amd64.exe"

if isCLI {
_, _ = maxprocs.Set() // Intentionally ignore errors for CLI binaries
} else {
_, err := maxprocs.Set(maxprocs.Logger(log.Infof))
if err != nil {
log.Errorf("Error setting GOMAXPROCS: %v", err)
}
}
}