check for CPU lable if no coretemp (#513)

Attempt to use "CPU" label before falling back to the first sensor.
This commit is contained in:
marchwicki 2023-05-21 06:31:39 -04:00 committed by GitHub
parent 717ab2d462
commit b1758ba74b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions

View File

@ -1156,8 +1156,19 @@ def sysinfo():
cpu_temp_index = core_temp_labels.index(f"Core {core}")
temp_per_cpu[i] = core_temp["coretemp"][cpu_temp_index].current
else:
temp = list(psutil.sensors_temperatures())
temp_per_cpu = [core_temp[temp[0]][0].current] * online_cpu_count
# iterate over all sensors
for sensor in core_temp:
# iterate over all temperatures in the current sensor
for temp in core_temp[sensor]:
if temp.label == 'CPU':
temp_per_cpu = [temp.current] * online_cpu_count
break
else:
continue
break
else: # if 'CPU' label not found in any sensor, use first available temperature
temp = list(core_temp.keys())[0]
temp_per_cpu = [core_temp[temp][0].current] * online_cpu_count
except Exception as e:
print(repr(e))
pass
@ -1233,4 +1244,4 @@ def not_running_daemon_check():
exit(1)
elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "disabled":
daemon_not_running_msg()
exit(1)
exit(1)