From 6c51602b219a0d814214873f770c37fb4adf126e Mon Sep 17 00:00:00 2001 From: Nikolay Mitrofanov Date: Thu, 1 Jan 2026 23:24:42 +0300 Subject: [PATCH 1/2] fix add multiple new lines in klog wrapper Signed-off-by: Nikolay Mitrofanov --- pkg/log/klog.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/log/klog.go b/pkg/log/klog.go index 0c5c05f..fd292a3 100644 --- a/pkg/log/klog.go +++ b/pkg/log/klog.go @@ -168,7 +168,7 @@ func newKlogWriterWrapper(logger Logger) *klogWriterWrapper { } func (l *klogWriterWrapper) Write(p []byte) (int, error) { - l.logger.DebugF("klog: %s", string(p)) + l.logger.DebugFWithoutLn("klog: %s", string(p)) return len(p), nil } From da505d5acc472dcabad6a5e464c6bec6e8bfee0d Mon Sep 17 00:00:00 2001 From: Nikolay Mitrofanov Date: Thu, 1 Jan 2026 23:34:03 +0300 Subject: [PATCH 2/2] fix SimpleLogger out format as message and !BADKEY string as format and args Signed-off-by: Nikolay Mitrofanov --- pkg/log/simple.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/log/simple.go b/pkg/log/simple.go index feddb63..c68daa2 100644 --- a/pkg/log/simple.go +++ b/pkg/log/simple.go @@ -16,6 +16,7 @@ package log import ( "bytes" + "fmt" "io" "github.com/deckhouse/deckhouse/pkg/log" @@ -81,7 +82,7 @@ func (d *SimpleLogger) Process(p Process, t string, run func() error) error { } func (d *SimpleLogger) InfoFWithoutLn(format string, a ...interface{}) { - d.logger.Info(format, a...) + d.logger.Info(fmt.Sprintf(format, a...)) } func (d *SimpleLogger) InfoLn(a ...interface{}) { @@ -89,7 +90,7 @@ func (d *SimpleLogger) InfoLn(a ...interface{}) { } func (d *SimpleLogger) ErrorFWithoutLn(format string, a ...interface{}) { - d.logger.Error(format, a...) + d.logger.Error(fmt.Sprintf(format, a...)) } func (d *SimpleLogger) ErrorLn(a ...interface{}) { @@ -98,7 +99,7 @@ func (d *SimpleLogger) ErrorLn(a ...interface{}) { func (d *SimpleLogger) DebugFWithoutLn(format string, a ...interface{}) { if d.isDebug { - d.logger.Debug(format, a...) + d.logger.Debug(fmt.Sprintf(format, a...)) } } @@ -122,7 +123,7 @@ func (d *SimpleLogger) FailRetry(l string) { } func (d *SimpleLogger) WarnFWithoutLn(format string, a ...interface{}) { - d.logger.Warn(format, a...) + d.logger.Warn(fmt.Sprintf(format, a...)) } func (d *SimpleLogger) WarnLn(a ...interface{}) {