Skip to content

🐛 Initialize logging at correct time #1779

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

Merged
merged 1 commit into from
Feb 14, 2025
Merged

🐛 Initialize logging at correct time #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion catalogd/cmd/catalogd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ func init() {

utilruntime.Must(clientgoscheme.AddToScheme(scheme))
utilruntime.Must(catalogdv1.AddToScheme(scheme))
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
}

func main() {
Expand Down Expand Up @@ -189,7 +190,6 @@ func validateConfig(cfg *config) error {
}

func run(ctx context.Context) error {
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
if klog.V(4).Enabled() {
logrus.SetLevel(logrus.DebugLevel)
}
Expand Down
9 changes: 5 additions & 4 deletions cmd/operator-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,14 @@ func init() {
operatorControllerCmd.AddCommand(versionCommand)

klog.InitFlags(flag.CommandLine)
if klog.V(4).Enabled() {
logrus.SetLevel(logrus.DebugLevel)
}

//add klog flags to flagset
flags.AddGoFlagSet(flag.CommandLine)

//add feature gate flags to flagset
features.OperatorControllerFeatureGate.AddFlag(flags)

ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
}
func validateMetricsFlags() error {
if (cfg.certFile != "" && cfg.keyFile == "") || (cfg.certFile == "" && cfg.keyFile != "") {
Expand All @@ -178,7 +177,9 @@ func validateMetricsFlags() error {
return nil
}
func run() error {
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
if klog.V(4).Enabled() {
logrus.SetLevel(logrus.DebugLevel)
}

setupLog.Info("starting up the controller", "version info", version.String())

Expand Down
Loading