diff options
| author | Simon Rettberg | 2019-01-24 12:17:07 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-01-24 12:17:07 +0100 |
| commit | c124192e63bd8a48ed1e7caf9542dc52505dfd22 (patch) | |
| tree | e43d3ceb7ba0b81e01d0924f384bc61578deeca7 /modules-available/statistics/inc/parser.inc.php | |
| parent | [locationinfo] use set config language for panels (diff) | |
| download | slx-admin-c124192e63bd8a48ed1e7caf9542dc52505dfd22.tar.gz slx-admin-c124192e63bd8a48ed1e7caf9542dc52505dfd22.tar.xz slx-admin-c124192e63bd8a48ed1e7caf9542dc52505dfd22.zip | |
[statistics] Handling of standby state in statistics, log crashes
Or rather, not really crashes, but log whenever a client reports a
poweron event without reporting a proper shutdown first. This isn't
neccessarily a crash but could also be due to power loss, hard poweroff,
or network failures.
Diffstat (limited to 'modules-available/statistics/inc/parser.inc.php')
| -rw-r--r-- | modules-available/statistics/inc/parser.inc.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules-available/statistics/inc/parser.inc.php b/modules-available/statistics/inc/parser.inc.php index b179b4a3..0d39079d 100644 --- a/modules-available/statistics/inc/parser.inc.php +++ b/modules-available/statistics/inc/parser.inc.php @@ -104,10 +104,12 @@ class Parser { foreach ($lines as $line) { if (preg_match('/^Disk (\S+):.* (\d+) bytes/i', $line, $out)) { // --- Beginning of MBR disk --- + unset($hdd); if ($out[2] < 10000) // sometimes vmware reports lots of 512byte disks continue; + if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper + continue; // disk total size and name - unset($hdd); $mbrToMbFactor = 0; // This is != 0 for mbr $sectorToMbFactor = 0; // This is != for gpt $hdd = array( @@ -122,10 +124,12 @@ class Parser { $hdds[] = &$hdd; } elseif (preg_match('/^Disk (\S+):\s+(\d+)\s+sectors,/i', $line, $out)) { // --- Beginning of GPT disk --- + unset($hdd); if ($out[2] < 1000) // sometimes vmware reports lots of 512byte disks continue; + if (substr($out[1], 0, 8) === '/dev/dm-') // Ignore device mapper + continue; // disk total size and name - unset($hdd); $mbrToMbFactor = 0; // This is != 0 for mbr $sectorToMbFactor = 0; // This is != for gpt $hdd = array( @@ -213,7 +217,7 @@ class Parser { $hdd['size'] = round(($hdd['sectors'] * $sectorToMbFactor) / 1024); } $free = $hdd['size'] - $hdd['used']; - if ($free > 5 || ($free / $hdd['size']) > 0.1) { + if ($hdd['size'] > 0 && ($free > 5 || ($free / $hdd['size']) > 0.1)) { $hdd['partitions'][] = array( 'id' => 'free-id-' . $i, 'name' => Dictionary::translate('unused'), |