From 2c8309a6029908ee713f0970b1d6a8ad64590f0c Mon Sep 17 00:00:00 2001
From: infra-bot <bot@infra.qie.tv>
Date: Sat, 30 Nov 2019 15:37:25 +0800
Subject: [PATCH 1/2] fix filelogger bug

---
 filelog.go | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/filelog.go b/filelog.go
index a186018..6ae0df0 100644
--- a/filelog.go
+++ b/filelog.go
@@ -79,6 +79,12 @@ func NewFileLogger(path, name string, flushInterval time.Duration, fileSplitSize
 		flushInterval: flushInterval,
 		fileSplitSize: fileSplitSize,
 		bufferSize:    bufferSize,
+		writer: &bufferWriter{
+			logPath:     path,
+			logName:     name,
+			maxFileSize: fileSplitSize,
+			bufferSize:  bufferSize,
+		},
 	}
 	go writer.flushDaemon()
 	return writer
@@ -106,25 +112,12 @@ func (w *mFileLogger) Write(msg []byte) (n int, err error)  {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	writer := w.writer
-
-	if writer == nil {
-		w.writer = &bufferWriter{
-			logPath:     w.filepath,
-			logName:     w.name,
-			maxFileSize: w.fileSplitSize,
-			bufferSize:  w.bufferSize,
-		}
-		writer = w.writer
-	}
-
-	if err = writer.checkRotate(time.Now()); err != nil {
+	if err = w.writer.checkRotate(time.Now()); err != nil {
 		fmt.Println("[logkit] check rotate err: " + err.Error())
 		return
 	}
-
 	w.putBuffer(buf)
-	return 	writer.Write(buf.Bytes())
+	return 	w.writer.Write(buf.Bytes())
 }
 
 func (bufferW *bufferWriter) Write(p []byte) (int, error) {

From 7ac7bb2e4473fc016f879264cc0cd48e1f461ac5 Mon Sep 17 00:00:00 2001
From: infra-bot <bot@infra.qie.tv>
Date: Sat, 30 Nov 2019 15:43:25 +0800
Subject: [PATCH 2/2] fix filelogger bug

---
 filelog.go | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/filelog.go b/filelog.go
index 6ae0df0..865b433 100644
--- a/filelog.go
+++ b/filelog.go
@@ -79,12 +79,6 @@ func NewFileLogger(path, name string, flushInterval time.Duration, fileSplitSize
 		flushInterval: flushInterval,
 		fileSplitSize: fileSplitSize,
 		bufferSize:    bufferSize,
-		writer: &bufferWriter{
-			logPath:     path,
-			logName:     name,
-			maxFileSize: fileSplitSize,
-			bufferSize:  bufferSize,
-		},
 	}
 	go writer.flushDaemon()
 	return writer
@@ -97,6 +91,9 @@ func (w *mFileLogger) flushDaemon() {
 }
 
 func (w *mFileLogger) flush() (err error) {
+	if w.writer == nil {
+		return
+	}
 	err = w.writer.Flush()
 	if err != nil {
 		return
@@ -112,12 +109,25 @@ func (w *mFileLogger) Write(msg []byte) (n int, err error)  {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
-	if err = w.writer.checkRotate(time.Now()); err != nil {
+	writer := w.writer
+
+	if writer == nil {
+		w.writer = &bufferWriter{
+			logPath:     w.filepath,
+			logName:     w.name,
+			maxFileSize: w.fileSplitSize,
+			bufferSize:  w.bufferSize,
+		}
+		writer = w.writer
+	}
+
+	if err = writer.checkRotate(time.Now()); err != nil {
 		fmt.Println("[logkit] check rotate err: " + err.Error())
 		return
 	}
+
 	w.putBuffer(buf)
-	return 	w.writer.Write(buf.Bytes())
+	return 	writer.Write(buf.Bytes())
 }
 
 func (bufferW *bufferWriter) Write(p []byte) (int, error) {