Minor fixes

observIQ · Sep 8, 2020 · 48bbe84 · 48bbe84
1 parent e8ca3a8
commit 48bbe84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/operator/builtin/input/file/file_test.go b/operator/builtin/input/file/file_test.go
@@ -407,6 +407,7 @@ func TestFileSource_OffsetsAfterRestart(t *testing.T) {
 
 	// Start the source and expect a message
 	require.NoError(t, source.Start())
+	defer source.Stop()
 	waitForMessage(t, logReceived, "testlog1")
 
 	// Restart the source. Stop and build a new

diff --git a/operator/builtin/input/file/reader.go b/operator/builtin/input/file/reader.go
@@ -22,17 +22,18 @@ type FileReader struct {
 	LastSeenFileSize int64
 	Offset           int64
 
+	// This lock must be held any time an exported field
+	// on FileReader is written to, or any time it is read from
+	// outside the ReadToEnd goroutine
+	sync.Mutex `json:"-"`
+
 	fileInput *InputOperator
 
 	decoder      *encoding.Decoder
 	decodeBuffer []byte
 
 	readInProgress bool
 
-	// This lock must be held any time an exported field
-	// on FileReader is written to, or any time it is read from
-	// outside the ReadToEnd goroutine
-	sync.Mutex         `json:"-"`
 	*zap.SugaredLogger `json:"-"`
 }