FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

fix: Falsche Angabe von Ram free / used bei Debian Stretch

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15910 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister 2018-01-16 23:07:56 +00:00
parent 3677d3c791
commit 9418066313
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/42_SYSMON.pm
View File

@ -2263,7 +2263,11 @@ sub SYSMON_getRamAndSwap($$) {
if($hash->{helper}->{excludes}{'ramswap'}) {return $map;} if($hash->{helper}->{excludes}{'ramswap'}) {return $map;}
#my @speicher = qx(free -m); #my @speicher = qx(free -m);
my @speicher = SYSMON_execute($hash, "LANG=en free"); #my @speicher = SYSMON_execute($hash, "LANG=en free");
my $free_version = SYSMON_execute($hash, 'free -V');
$free_version =~ s/\D//g;
my @speicher = SYSMON_execute($hash, 'LANG=en ' . ($free_version > 339 ? 'free -w' : 'free'));
if(!@speicher) { if(!@speicher) {
return $map; return $map;
@ -2312,7 +2316,8 @@ sub SYSMON_getRamAndSwap($$) {
} }
#$used_clean = $used - $buffers - $cached; #$used_clean = $used - $buffers - $cached;
#$ram = sprintf("Total: %.2f MB, Used: %.2f MB, %.2f %%, Free: %.2f MB", $total, $used_clean, ($used_clean / $total * 100), ($free + $buffers + $cached)); #$ram = sprintf("Total: %.2f MB, Used: %.2f MB, %.2f %%, Free: %.2f MB", $total, $used_clean, ($used_clean / $total * 100), ($free + $buffers + $cached));
if ($total > 2048) { #if ($total > 2048) {
if ($free_version > 339) {
$used_clean = $used; $used_clean = $used;
$ram = sprintf("Total: %.2f MB, Used: %.2f MB, %.2f %%, Free: %.2f MB", $total, $used_clean, ($used_clean / $total * 100), ($free)); $ram = sprintf("Total: %.2f MB, Used: %.2f MB, %.2f %%, Free: %.2f MB", $total, $used_clean, ($used_clean / $total * 100), ($free));
} else { } else {