Read the CPU temperature instead of the alarm threshold beside it
lm-sensors prints high= and crit= on the same line as the reading, so scraping the line for its largest number reported a flat 100C on Intel while the shell's last-field parse got a bare ")" and never fired at all. One parse in the adapter now, preferring Tdie over Tctl since Tctl carries a +27C offset.
This commit is contained in:
@@ -275,9 +275,7 @@ function vv_watchdog_summary(): array {
|
||||
$loadRaw = @file_get_contents('/proc/loadavg') ?: '0';
|
||||
$load1 = (float)explode(' ', trim($loadRaw))[0];
|
||||
|
||||
$cpuTemp = null;
|
||||
$sensorsOut = shell_exec("sensors 2>/dev/null | grep -E 'Core 0|Package id 0|Tdie|Tctl|CPU Temp' | grep -oE '[0-9]+\\.[0-9]+' | sort -n | tail -1") ?: '';
|
||||
if ($sensorsOut && is_numeric(trim($sensorsOut))) $cpuTemp = (int)round((float)trim($sensorsOut));
|
||||
$cpuTemp = vv_cpu_temp();
|
||||
|
||||
$zombies = (int)trim(shell_exec("ps -eo stat 2>/dev/null | grep -c '^Z'") ?: '0');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user