fix: rotating every line after first interval

qazwsxedckll · Mar 18, 2024 · 5621e17 · 5621e17
1 parent 15832ba
commit 5621e17
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/rotate_file.go b/rotate_file.go
@@ -88,6 +88,7 @@ func (r *RotateFile) rotate() {
 			r.file.Close()
 		}
 		r.file = file
+		r.written = 0
 		r.lastRotate = now
 	}
 }

diff --git a/rotate_file_test.go b/rotate_file_test.go
@@ -28,41 +28,44 @@ func TestRotateSize(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(path)
 
-	file, err := NewRotateFile(path, "test", 10)
+	file, err := NewRotateFile(path, "test", 100)
 	require.NoError(t, err)
 
-	_, err = file.Write([]byte("12345678901234567890"))
-	require.NoError(t, err)
-	_, err = file.Write([]byte("12345678901234567890"))
-	require.NoError(t, err)
+	b := []byte("test\n")
+	for range 100 {
+		require.NoError(t, err)
+		_, err = file.Write(b)
+		require.NoError(t, err)
+	}
 
 	dir, err := os.ReadDir(path)
 	require.NoError(t, err)
-	require.Len(t, dir, 3)
+	require.Len(t, dir, 5)
 }
 
 func TestRotateInterval(t *testing.T) {
 	path, err := os.MkdirTemp("", "loghtest-TestRotateInterval")
 	require.NoError(t, err)
 	defer os.RemoveAll(path)
 
-	file, err := NewRotateFile(path, "test", 1024, WithCheckEveryN(2), WithRotateInterval(1*time.Second))
+	file, err := NewRotateFile(path, "test", 1024, WithCheckEveryN(1), WithRotateInterval(100*time.Millisecond))
 	require.NoError(t, err)
 
-	_, err = file.Write([]byte("1"))
-	require.NoError(t, err)
-	_, err = file.Write([]byte("2"))
-	require.NoError(t, err)
+	b := []byte("test\n")
+	for range 5 {
+		_, err = file.Write(b)
+		require.NoError(t, err)
+	}
 
 	dir, err := os.ReadDir(path)
 	require.NoError(t, err)
 	require.Len(t, dir, 1)
 
-	time.Sleep(1 * time.Second)
-	_, err = file.Write([]byte("1"))
-	require.NoError(t, err)
-	_, err = file.Write([]byte("2"))
-	require.NoError(t, err)
+	time.Sleep(100 * time.Millisecond)
+	for range 5 {
+		_, err = file.Write(b)
+		require.NoError(t, err)
+	}
 
 	dir, err = os.ReadDir(path)
 	require.NoError(t, err)