From 3938c65f7d5124062e072b431dd58d754b19162a Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Fri, 22 Dec 2017 00:51:25 +0100 Subject: [PATCH] fix log format --- common/log/logger.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/common/log/logger.go b/common/log/logger.go index b49d5c471..f6b1ed101 100644 --- a/common/log/logger.go +++ b/common/log/logger.go @@ -11,7 +11,8 @@ import ( ) type LogWriter interface { - io.WriteCloser + Write(string) error + io.Closer } type LogWriterCreator func() LogWriter @@ -44,13 +45,10 @@ func (l *generalLogger) run() { } defer logger.Close() - ls := []byte(platform.LineSeparator()) - for { select { case msg := <-l.buffer: - logger.Write([]byte(msg.String())) - logger.Write(ls) + logger.Write(msg.String() + platform.LineSeparator()) dataWritten = true case <-ticker.C: if !dataWritten { @@ -78,9 +76,9 @@ type consoleLogWriter struct { logger *log.Logger } -func (w *consoleLogWriter) Write(b []byte) (int, error) { - w.logger.Print(string(b)) - return len(b), nil +func (w *consoleLogWriter) Write(s string) error { + w.logger.Print(s) + return nil } func (w *consoleLogWriter) Close() error { @@ -92,9 +90,9 @@ type fileLogWriter struct { logger *log.Logger } -func (w *fileLogWriter) Write(b []byte) (int, error) { - w.logger.Print(string(b)) - return len(b), nil +func (w *fileLogWriter) Write(s string) error { + w.logger.Print(s) + return nil } func (w *fileLogWriter) Close() error {