Fix hwmon error capture (#2915)

Fix golangci-lint "ineffectual assignment" by correctly capturing any errors within the hwmon gathering loop. Signed-off-by: Ben Kochie <[email protected]>
prometheus · Feb 7, 2024 · 29fca60 · 29fca60
1 parent fe78e7e
commit 29fca60
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go
@@ -444,6 +444,7 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
 		return err
 	}
 
+	var lastErr error
 	for _, hwDir := range hwmonFiles {
 		hwmonXPathName := filepath.Join(hwmonPathName, hwDir.Name())
 		fileInfo, err := os.Lstat(hwmonXPathName)
@@ -462,10 +463,10 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
 			continue
 		}
 
-		if lastErr := c.updateHwmon(ch, hwmonXPathName); lastErr != nil {
-			err = lastErr
+		if err = c.updateHwmon(ch, hwmonXPathName); err != nil {
+			lastErr = err
 		}
 	}
 
-	return err
+	return lastErr
 }