Fix error handling and add nolint comment (#41256)

belimawr · rdner · web-flow · commit c1fc9a974d7a · 2024-10-16T14:48:57.000Z
---------

Co-authored-by: Denis &lt;denis@rdner.de&gt;
diff --git a/filebeat/input/systemlogs/input.go b/filebeat/input/systemlogs/input.go
@@ -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 {
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func useJournald(c *conf.C) (bool, error) {`
`119`	`119`
`120`	`120`	`cfg := config{}`
`121`	`121`	`if err := c.Unpack(&cfg); err != nil {`
`122`		`- return false, nil`
	`122`	`+ return false, fmt.Errorf("cannot unpack 'system-logs' config: %w", err)`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`if cfg.UseJournald {`
`@@ -159,7 +159,7 @@ func useJournald(c *conf.C) (bool, error) {`
`159`	`159`	`return true, nil`
`160`	`160`	`}`
`161`	`161`
`162`		`-func toJournaldConfig(cfg conf.C) (conf.C, error) {`
	`162`	`+func toJournaldConfig(cfg conf.C) (conf.C, error) { //nolint:unused // It's used on Linux`
`163`	`163`	`newCfg, err := cfg.Child("journald", -1)`
`164`	`164`	`if err != nil {`
`165`	`165`	`return nil, fmt.Errorf("cannot extract 'journald' block: %w", err)`