fix(agent): Only rotate log on SIGHUP if needed (influxdata#12740)

gwos · Mar 1, 2023 · 3f3885a · 3f3885a
1 parent d4926c6
commit 3f3885a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/rotate/file_writer.go b/internal/rotate/file_writer.go
@@ -95,7 +95,12 @@ func (w *FileWriter) Close() (err error) {
 	defer w.Unlock()
 
 	// Rotate before closing
-	if err = w.rotate(); err != nil {
+	if err := w.rotateIfNeeded(); err != nil {
+		return err
+	}
+
+	// Close the file if we did not rotate
+	if err := w.current.Close(); err != nil {
 		return err
 	}
 

diff --git a/internal/rotate/file_writer_test.go b/internal/rotate/file_writer_test.go
@@ -129,7 +129,7 @@ func TestFileWriter_DeleteArchives(t *testing.T) {
 	}
 }
 
-func TestFileWriter_CloseRotates(t *testing.T) {
+func TestFileWriter_CloseDoesNotRotate(t *testing.T) {
 	tempDir := t.TempDir()
 	maxSize := int64(9)
 	writer, err := NewFileWriter(filepath.Join(tempDir, "test.log"), 0, maxSize, -1)
@@ -138,5 +138,5 @@ func TestFileWriter_CloseRotates(t *testing.T) {
 
 	files, _ := os.ReadDir(tempDir)
 	assert.Equal(t, 1, len(files))
-	assert.Regexp(t, "^test\\.[^\\.]+\\.log$", files[0].Name())
+	assert.Regexp(t, "^test.log$", files[0].Name())
 }