Skip to content

Fix error handling and add nolint comment #41256

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

Merged
belimawr merged 2 commits into from
Oct 16, 2024
Merged

Fix error handling and add nolint comment #41256

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97ee8e
Fix error handling and add nolint comment
belimawr Oct 16, 2024
aa0dd0e
Update filebeat/input/systemlogs/input.go
belimawr Oct 16, 2024
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 @@ func useJournald(c *conf.C) (bool, error) {

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 @@ func useJournald(c *conf.C) (bool, error) {
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
newCfg, err := cfg.Child("journald", -1)
if err != nil {
return nil, fmt.Errorf("cannot extract 'journald' block: %w", err)
Expand Down