Merge pull request #234 from sustainable-computing-io/hwmon

Marcelo Carneiro do Amaral · web-flow · commit c3f8395beb9d · 2022-09-23T10:44:59.000+09:00
acpi power sensordon't continue if the power meter doesn't exist
diff --git a/pkg/power/acpi/acpi.go b/pkg/power/acpi/acpi.go
@@ -174,14 +174,14 @@ func getPowerFromSensor() (map[string]float64, error) {
 		path := fmt.Sprintf(powerPath, i)
 		data, err := os.ReadFile(path)
 		if err != nil {
-			return power, err
+			break
 		}
 		// currPower is in microWatt
 		currPower, err := strconv.ParseUint(strings.TrimSpace(string(data)), 10, 64)
 		if err == nil {
 			power[fmt.Sprintf("%s%d", sensorIDPrefix, i)] = float64(currPower) / 1000 /*miliWatts*/
 		} else {
-			log.Fatal(err)
+			return power, err
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -174,14 +174,14 @@ func getPowerFromSensor() (map[string]float64, error) {`
`174`	`174`	`path := fmt.Sprintf(powerPath, i)`
`175`	`175`	`data, err := os.ReadFile(path)`
`176`	`176`	`if err != nil {`
`177`		`- return power, err`
	`177`	`+ break`
`178`	`178`	`}`
`179`	`179`	`// currPower is in microWatt`
`180`	`180`	`currPower, err := strconv.ParseUint(strings.TrimSpace(string(data)), 10, 64)`
`181`	`181`	`if err == nil {`
`182`	`182`	`power[fmt.Sprintf("%s%d", sensorIDPrefix, i)] = float64(currPower) / 1000 /miliWatts/`
`183`	`183`	`} else {`
`184`		`- log.Fatal(err)`
	`184`	`+ return power, err`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`