Initialize the interval trigger

Without lastRotate initialized an interval trigger will always trigger a rotation the first time its callback is executed.
elastic · Dec 3, 2024 · 1db533b · 1db533b
1 parent fea0092
commit 1db533b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/file/rotator_test.go b/file/rotator_test.go
@@ -173,7 +173,7 @@ func TestDailyRotation(t *testing.T) {
 		WriteMsg(t, r)
 	}
 
-	AssertDirContents(t, dir, logname+"-"+today+"-1.ndjson", logname+"-"+today+"-2.ndjson", logname+"-"+today+"-3.ndjson", logname+"-diagnostic-"+twoDaysAgo+".zip")
+	AssertDirContents(t, dir, logname+"-"+today+".ndjson", logname+"-"+today+"-1.ndjson", logname+"-"+today+"-2.ndjson", logname+"-diagnostic-"+twoDaysAgo+".zip")
 }
 
 // Tests the FileConfig.RotateOnStartup parameter

diff --git a/file/trigger.go b/file/trigger.go
@@ -138,6 +138,8 @@ func newIntervalTrigger(interval time.Duration, clock clock) trigger {
 			return lastInterval != currentInterval
 		}
 	}
+
+	t.lastRotate = time.Now()
 	return &t
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			return lastInterval != currentInterval
     		}
     	}
+    	t.lastRotate = time.Now()
     	return &t
     }
@@ Expand Down @@