Skip to content

Commit 237ec1c

Browse files
authored
Initialize logging at correct time (#1779)
Do ctrl.SetLogger() in init() Check klog.V(4).Enabled() in run() (after flags have been parsed) Signed-off-by: Todd Short <[email protected]>
1 parent 0e9673b commit 237ec1c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Diff for: catalogd/cmd/catalogd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ func init() {
146146

147147
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
148148
utilruntime.Must(catalogdv1.AddToScheme(scheme))
149+
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
149150
}
150151

151152
func main() {
@@ -189,7 +190,6 @@ func validateConfig(cfg *config) error {
189190
}
190191

191192
func run(ctx context.Context) error {
192-
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
193193
if klog.V(4).Enabled() {
194194
logrus.SetLevel(logrus.DebugLevel)
195195
}

Diff for: cmd/operator-controller/main.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,14 @@ func init() {
147147
operatorControllerCmd.AddCommand(versionCommand)
148148

149149
klog.InitFlags(flag.CommandLine)
150-
if klog.V(4).Enabled() {
151-
logrus.SetLevel(logrus.DebugLevel)
152-
}
153150

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

157154
//add feature gate flags to flagset
158155
features.OperatorControllerFeatureGate.AddFlag(flags)
156+
157+
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
159158
}
160159
func validateMetricsFlags() error {
161160
if (cfg.certFile != "" && cfg.keyFile == "") || (cfg.certFile == "" && cfg.keyFile != "") {
@@ -178,7 +177,9 @@ func validateMetricsFlags() error {
178177
return nil
179178
}
180179
func run() error {
181-
ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
180+
if klog.V(4).Enabled() {
181+
logrus.SetLevel(logrus.DebugLevel)
182+
}
182183

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

0 commit comments

Comments
 (0)