Skip to content
Snippets Groups Projects
Commit c0066a32 authored by Tibo's avatar Tibo
Browse files

Fix record key name and remove unused code

parent a3d52755
No related branches found
No related tags found
No related merge requests found
Pipeline #3309 passed
...@@ -14,7 +14,7 @@ class CPUtemperature extends \App\AbstractSensor ...@@ -14,7 +14,7 @@ class CPUtemperature extends \App\AbstractSensor
public function report() public function report()
{ {
$record = $this->getLastRecord("cputemperature"); $record = $this->getLastRecord("cpu-temperature");
if ($record == null) { if ($record == null) {
return "<p>No data available...</p>" return "<p>No data available...</p>"
. "<p>Maybe <code>sensors</code> is not installed.</p>" . "<p>Maybe <code>sensors</code> is not installed.</p>"
...@@ -34,13 +34,13 @@ class CPUtemperature extends \App\AbstractSensor ...@@ -34,13 +34,13 @@ class CPUtemperature extends \App\AbstractSensor
public function status() public function status()
{ {
$record = $this->getLastRecord("cputemperature"); $record = $this->getLastRecord("cpu-temperature");
if ($record == null) { if ($record == null) {
return self::STATUS_UNKNOWN; return self::STATUS_UNKNOWN;
} }
$all_status = []; $all_status = [];
foreach (self::parse($record->cputemperature) as $CPUTemp) { foreach (self::parse($record['cpu-temperature']) as $CPUTemp) {
/* @var $CPUTemp Temperature */ /* @var $CPUTemp Temperature */
$status = self::STATUS_OK; $status = self::STATUS_OK;
if ($CPUTemp->value > 100) { if ($CPUTemp->value > 100) {
...@@ -52,25 +52,18 @@ class CPUtemperature extends \App\AbstractSensor ...@@ -52,25 +52,18 @@ class CPUtemperature extends \App\AbstractSensor
return max($all_status); return max($all_status);
} }
public static $skip_fs = ["none"];
public static function parse(string $string) public static function parse(string $string)
{ {
$values = array(); $values = array();
preg_match_all(self::REGEXP, $string, $values); preg_match_all(self::REGEXP, $string, $values);
$CPUTEMPS = array(); $temperatures = array();
$count = count($values[1]); $count = count($values[1]);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$fs = $values[1][$i];
if (in_array($fs, self::$skip_fs)) {
continue;
}
$CPUTemp = new Temperature(); $CPUTemp = new Temperature();
$CPUTemp->name = $fs; $CPUTemp->name = $values[1][$i];
$CPUTemp->value = $values[2][$i]; $CPUTemp->value = $values[2][$i];
$CPUTEMPS[] = $CPUTemp; $temperatures[] = $CPUTemp;
} }
return $CPUTEMPS; return $temperatures;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment