Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore][pkg/stanza]: when found duplicate, continue from outer loop #28889

Merged
merged 1 commit into from
Nov 10, 2023
+3 −1
Merged

[chore][pkg/stanza]: when found duplicate, continue from outer loop #28889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/stanza/fileconsumer/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ func (m *Manager) makeFingerprint(path string) (*fingerprint.Fingerprint, *os.Fi
// been read this polling interval
func (m *Manager) makeReaders(paths []string) []*reader.Reader {
readers := make([]*reader.Reader, 0, len(paths))
OUTER:
for _, path := range paths {
fp, file := m.makeFingerprint(path)
if fp == nil {
Expand All @@ -210,7 +211,7 @@ func (m *Manager) makeReaders(paths []string) []*reader.Reader {
if err := file.Close(); err != nil {
m.Debugw("problem closing file", zap.Error(err))
}
continue
continue OUTER
}
}

Expand Down
1 change: 1 addition & 0 deletions pkg/stanza/fileconsumer/file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,6 +1662,7 @@ func TestStalePartialFingerprintDiscarded(t *testing.T) {
waitForToken(t, emitCalls, []byte(content))
expectNoTokens(t, emitCalls)
operator.wg.Wait()
require.Len(t, operator.previousPollFiles, 1)

// keep append data to file1 and file2
newContent := "bbbbbbbbbbbb"
Expand Down