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

fix(inputs.tail): Retry opening file after permission denied #14357

Merged
merged 3 commits into from
Nov 30, 2023
Merged

fix(inputs.tail): Retry opening file after permission denied #14357

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b867c5
fix(inputs.tail): If permission denied delete old tailer
ericmiller-wpengine Nov 27, 2023
264219c
Single log, containing error in either case
ericmiller-wpengine Nov 30, 2023
7c227ac
Merge branch 'influxdata:master' into tail-plugin-retry-file-open
ericmiller-wpengine Nov 30, 2023
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
4 changes: 4 additions & 0 deletions plugins/inputs/tail/tail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ func (t *Tail) tailNewFiles(fromBeginning bool) error {

if err := tailer.Err(); err != nil {
t.Log.Errorf("Tailing %q: %s", tailer.Filename, err.Error())
if strings.HasSuffix(err.Error(), "permission denied") {
srebhan marked this conversation as resolved.
Show resolved Hide resolved
t.Log.Errorf("Deleting tailer for %q", tailer.Filename)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about adding some details like

Suggested change
t.Log.Errorf("Deleting tailer for %q", tailer.Filename)
t.Log.Errorf("Deleting tailer for %q: %v", tailer.Filename, err)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the previous log message into an else at the same time, hopefully this is adequately idiomatic.

delete(t.tailers, tailer.Filename)
}
}
}()

Expand Down
Loading