Set up klog to write to our custom logger

pkg/logger/klog.go

@@ -0,0 +1,29 @@
+package logger
+
+// KlogInfoLogger is used for info level log output in Klog
+type KlogInfoLogger struct {
+	logger *Logger
+}
+
+// Write is used to output klog log lines
+func (l *KlogInfoLogger) Write(data []byte) (int, error) {
+	l.logger.Output(DEFAULT, 6, string(data))
+	return len(data), nil
+}
+
+// KlogInfoLogger is used for error level log output in Klog
+type KlogErrorLogger struct {
+	logger *Logger
+}
+
+// Write is used to output klog log lines
+func (l *KlogErrorLogger) Write(data []byte) (int, error) {
+	l.logger.Output(ERROR, 6, string(data))
+	return len(data), nil
+}
+
+// StdKlogInfoLogger is an info logger using the standard logger
+var StdKlogInfoLogger = &KlogInfoLogger{logger: std}
+
+// StdKlogErrorLogger is an info logger using the standard logger
+var StdKlogErrorLogger = &KlogErrorLogger{logger: std}

pkg/logger/logger.go

@@ -149,9 +149,12 @@ func (l *Logger) formatLogMessage(calldepth int, message string) []byte {
 		panic(err)
 	}
 
-	_, err = logBuff.Write([]byte("\n"))
-	if err != nil {
-		panic(err)
+	// If the output doesn't end with a new line, add one
+	if string(logBuff.Bytes()[logBuff.Len()-1]) != "\n" {
+		_, err = logBuff.Write([]byte("\n"))
+		if err != nil {
+			panic(err)
+		}
 	}
 
 	return logBuff.Bytes()