From 1a42154c64f625037742e3fc68809653ee288837 Mon Sep 17 00:00:00 2001
From: chenxiaonan01 <chenxiaonan01@baidu.com>
Date: Wed, 20 Dec 2017 17:54:40 +0800
Subject: [PATCH] add file test

---
 logs/file.go      | 26 +++++++++++++++-----------
 logs/file_test.go | 40 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/logs/file.go b/logs/file.go
index 9c29e487..3e102f07 100644
--- a/logs/file.go
+++ b/logs/file.go
@@ -281,7 +281,6 @@ func (w *fileLogWriter) doRotate(logTime time.Time) error {
 	// file exists
 	// Find the next available number
 	num := 1
-	fmt.Println("num :", num)
 	fName := ""
 	format := ""
 	var openTime time.Time
@@ -312,13 +311,11 @@ func (w *fileLogWriter) doRotate(logTime time.Time) error {
 	} else {
 		fName = fmt.Sprintf("%s.%s%s", w.fileNameOnly, openTime.Format(format), w.suffix)
 		_, err = os.Lstat(fName)
-		fmt.Println("befor fName:", fName)
 		for ; err == nil && num <= 999; num++ {
 			fName = w.fileNameOnly + fmt.Sprintf(".%s.%03d%s", openTime.Format(format), num, w.suffix)
 			_, err = os.Lstat(fName)
 		}
 	}
-	fmt.Println("after fName:", fName)
 	// return error if the last file checked still existed
 	if err == nil {
 		return fmt.Errorf("Rotate: Cannot find free log number to rename %s", w.Filename)
@@ -362,14 +359,21 @@ func (w *fileLogWriter) deleteOldLog() {
 		if info == nil {
 			return
 		}
-
-		if !info.IsDir() && info.ModTime().Add(24*time.Hour*time.Duration(w.MaxDays)).Before(time.Now()) {
-			if strings.HasPrefix(filepath.Base(path), filepath.Base(w.fileNameOnly)) &&
-				strings.HasSuffix(filepath.Base(path), w.suffix) {
-				os.Remove(path)
-			}
-		}
-		os.Exit(0)
+        if w.Hourly {
+            if !info.IsDir() && info.ModTime().Add(1*time.Hour*time.Duration(w.MaxHours)).Before(time.Now()) {
+                if strings.HasPrefix(filepath.Base(path), filepath.Base(w.fileNameOnly)) &&
+                strings.HasSuffix(filepath.Base(path), w.suffix) {
+                    os.Remove(path)
+                }
+            }
+        } else if w.Daily {
+            if !info.IsDir() && info.ModTime().Add(24*time.Hour*time.Duration(w.MaxDays)).Before(time.Now()) {
+                if strings.HasPrefix(filepath.Base(path), filepath.Base(w.fileNameOnly)) &&
+                strings.HasSuffix(filepath.Base(path), w.suffix) {
+                    os.Remove(path)
+                }
+            }
+        }
 		return
 	})
 }
diff --git a/logs/file_test.go b/logs/file_test.go
index 621638b7..333209c6 100644
--- a/logs/file_test.go
+++ b/logs/file_test.go
@@ -186,7 +186,7 @@ func TestFileDailyRotate_06(t *testing.T) { //test file mode
 
 func TestFileHourlyRotate_01(t *testing.T) {
 	log := NewLogger(10000)
-	log.SetLogger("file", `{"filename":"test3.log","maxlines":4}`)
+    log.SetLogger("file", `{"filename":"test3.log","hourly":true,"maxlines":4}`)
 	log.Debug("debug")
 	log.Info("info")
 	log.Notice("notice")
@@ -220,12 +220,12 @@ func TestFileHourlyRotate_03(t *testing.T) {
 	os.Remove(fn)
 }
 
-/*
 func TestFileHourlyRotate_04(t *testing.T) {
 	fn1 := "rotate_hour.log"
 	fn2 := "rotate_hour." + time.Now().Add(-1*time.Hour).Format("2006010215") + ".log"
 	testFileHourlyRotate(t, fn1, fn2)
 }
+
 func TestFileHourlyRotate_05(t *testing.T) {
 	fn1 := "rotate_hour.log"
 	fn := "rotate_hour." + time.Now().Add(-1*time.Hour).Format("2006010215") + ".log"
@@ -234,9 +234,10 @@ func TestFileHourlyRotate_05(t *testing.T) {
 	testFileHourlyRotate(t, fn1, fn2)
 	os.Remove(fn)
 }
+
 func TestFileHourlyRotate_06(t *testing.T) { //test file mode
 	log := NewLogger(10000)
-	log.SetLogger("file", `{"filename":"test3.log","maxlines":4}`)
+    log.SetLogger("file", `{"filename":"test3.log", "hourly":true, "maxlines":4}`)
 	log.Debug("debug")
 	log.Info("info")
 	log.Notice("notice")
@@ -255,7 +256,7 @@ func TestFileHourlyRotate_06(t *testing.T) { //test file mode
 	os.Remove(rotateName)
 	os.Remove("test3.log")
 }
-*/
+
 func testFileRotate(t *testing.T, fn1, fn2 string, daily, hourly bool) {
 	fw := &fileLogWriter{
 		Daily:      daily,
@@ -324,6 +325,37 @@ func testFileDailyRotate(t *testing.T, fn1, fn2 string) {
 	fw.Destroy()
 }
 
+func testFileHourlyRotate(t *testing.T, fn1, fn2 string) {
+	fw := &fileLogWriter{
+        Hourly:      true,
+        MaxHours:    168,
+		Rotate:     true,
+		Level:      LevelTrace,
+		Perm:       "0660",
+		RotatePerm: "0440",
+	}
+	fw.Init(fmt.Sprintf(`{"filename":"%v","maxhours":1}`, fn1))
+	fw.hourlyOpenTime = time.Now().Add(-1 * time.Hour)
+	fw.hourlyOpenDate = fw.hourlyOpenTime.Hour()
+	hour, _ := time.ParseInLocation("2006010215", time.Now().Format("2006010215"), fw.hourlyOpenTime.Location())
+	hour = hour.Add(-1 * time.Second)
+	fw.hourlyRotate(hour)
+	for _, file := range []string{fn1, fn2} {
+		_, err := os.Stat(file)
+		if err != nil {
+			t.FailNow()
+		}
+		content, err := ioutil.ReadFile(file)
+		if err != nil {
+			t.FailNow()
+		}
+		if len(content) > 0 {
+			t.FailNow()
+		}
+		os.Remove(file)
+	}
+	fw.Destroy()
+}
 func exists(path string) (bool, error) {
 	_, err := os.Stat(path)
 	if err == nil {