修复日志丢失问题

Author: c-wind

log/log_test.go

@@ -1,10 +1,15 @@
 package log
 
 import (
+	"os"
 	"testing"
 	"time"
 )
 
+const (
+	testLogFile = "./test.log"
+)
+
 func TestLog(t *testing.T) {
 	Debug("default log begin")
 	Infof("%v test log", time.Now())
@@ -18,6 +23,8 @@ func TestLog(t *testing.T) {
 	l.Errorf("logger no color %v yyyyyy", time.Now().UnixNano())
 	Infof("%v default has color test log", time.Now())
 
-	l.SetOutputFile("./vvv.log").SetRolling(true)
+	l.SetOutputFile(testLogFile).SetRolling(true)
 	l.Info(time.Now())
+	os.Remove(testLogFile)
+
 }

log/writer.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"runtime"
 	"sync"
+	"syscall"
 	"time"
 )
 
@@ -114,16 +115,22 @@ func (l *Logger) caller() (string, string) {
 }
 
 func (l *Logger) rotate(now time.Time) {
+	fmt.Printf("now:%v, fileTime:%v\n", now, l.fileTime)
 	if !l.rolling || l.file == nil || now.Before(l.fileTime) {
 		return
 	}
 
 	l.out.Flush()
-	l.file.Close()
 
-	oldFile := l.fileName + "." + time.Now().AddDate(0, 0, -1).Format("20060102")
+	oldFile := l.fileName + "." + now.AddDate(0, 0, -1).Format("20060102")
+
+	syscall.Flock(int(l.file.Fd()), syscall.LOCK_EX)
+	if _, err := os.Stat(oldFile); err != nil {
+		os.Rename(l.fileName, oldFile)
+	}
+	syscall.Flock(int(l.file.Fd()), syscall.LOCK_UN)
 
-	os.Rename(l.fileName, oldFile)
+	l.file.Close()
 
 	l.SetOutputFile(l.fileName)
 }