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

[8.x](backport #41256) Fix error handling and add nolint comment #41260

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[8.x](backport #41256) Fix error handling and add nolint comment #41260

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
4 changes: 2 additions & 2 deletions filebeat/input/systemlogs/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@

cfg := config{}
if err := c.Unpack(&cfg); err != nil {
return false, nil
return false, fmt.Errorf("cannot unpack 'system-logs' config: %w", err)
}

if cfg.UseJournald {
Expand Down Expand Up @@ -159,7 +159,7 @@
return true, nil
}

func toJournaldConfig(cfg *conf.C) (*conf.C, error) {
func toJournaldConfig(cfg *conf.C) (*conf.C, error) { //nolint:unused // It's used on Linux

Check failure on line 162 in filebeat/input/systemlogs/input.go

View workflow job for this annotation

GitHub Actions / lint (linux) 

directive `//nolint:unused // It's used on Linux` is unused for linter "unused" (nolintlint)
newCfg, err := cfg.Child("journald", -1)
if err != nil {
return nil, fmt.Errorf("cannot extract 'journald' block: %w", err)
Expand Down
Loading