Skip to content

Commit 33f1a91

Browse files
3u13relchead
authored andcommitted
cli: also log applier debug messages to debug log file (#3457)
* cli: also log applier debug messages to debug log file * cli: use debug logger instead of cliLogger
1 parent 5196de1 commit 33f1a91

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

cli/internal/cmd/apply.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@ func (f *applyFlags) parse(flags *pflag.FlagSet) error {
211211

212212
// runApply sets up the apply command and runs it.
213213
func runApply(cmd *cobra.Command, _ []string) error {
214-
log, err := newCLILogger(cmd)
215-
if err != nil {
216-
return fmt.Errorf("creating logger: %w", err)
217-
}
218214
spinner, err := newSpinnerOrStderr(cmd)
219215
if err != nil {
220216
return err
@@ -227,7 +223,7 @@ func runApply(cmd *cobra.Command, _ []string) error {
227223
}
228224

229225
fileHandler := file.NewHandler(afero.NewOsFs())
230-
logger, err := newDebugFileLogger(cmd, fileHandler)
226+
debugLogger, err := newDebugFileLogger(cmd, fileHandler)
231227
if err != nil {
232228
return err
233229
}
@@ -250,15 +246,15 @@ func runApply(cmd *cobra.Command, _ []string) error {
250246
)
251247
}
252248

253-
applier := constellation.NewApplier(log, spinner, constellation.ApplyContextCLI, newDialer)
249+
applier := constellation.NewApplier(debugLogger, spinner, constellation.ApplyContextCLI, newDialer)
254250

255251
apply := &applyCmd{
256252
fileHandler: fileHandler,
257253
flags: flags,
258-
log: logger,
259-
wLog: &warnLogger{cmd: cmd, log: log},
254+
log: debugLogger,
255+
wLog: &warnLogger{cmd: cmd, log: debugLogger},
260256
spinner: spinner,
261-
merger: &kubeconfigMerger{log: log},
257+
merger: &kubeconfigMerger{log: debugLogger},
262258
newInfraApplier: newInfraApplier,
263259
imageFetcher: imagefetcher.New(),
264260
applier: applier,
@@ -826,6 +822,7 @@ func (wl warnLogger) Info(msg string, args ...any) {
826822
// Warn prints a formatted warning from the validator.
827823
func (wl warnLogger) Warn(msg string, args ...any) {
828824
wl.cmd.PrintErrf("Warning: %s %s\n", msg, fmt.Sprint(args...))
825+
wl.log.Debug(msg, args...)
829826
}
830827

831828
type warnLog interface {

0 commit comments

Comments
 (0)