mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent some warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8185 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister
2015-03-09 19:24:53 +00:00
parent 403d4e8852
commit d01ce1a439
1 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/42_SYSMON.pm
View File

@@ -1417,8 +1417,9 @@ SYSMON_getUptime($$)
#my $uptime_str = qx(cat /proc/uptime );
my $uptime_str = SYSMON_execute($hash, "cat /proc/uptime");
if(defined($uptime_str)) {
my ($uptime, $idle) = split(/\s+/, trim($uptime_str));
if(int($uptime)!=0) {
if(defined($uptime) && int($uptime)!=0) {
# Anzahl Cores beruecksichtigen
my $core_num = SYSMON_getCPUCoreNum($hash);
my $idle_percent = $idle/($uptime*$core_num)*100;
@@ -1431,7 +1432,7 @@ SYSMON_getUptime($$)
$map->{+IDLETIME_TEXT} = sprintf("%d days, %02d hours, %02d minutes",SYSMON_decode_time_diff($idle)).sprintf(" (%.2f %%)",$idle_percent);
#$map->{+IDLETIME_PERCENT} = sprintf ("%.2f %",$idle_percent);
}
}
return $map;
}
@@ -1447,6 +1448,7 @@ SYSMON_getUptime2($$)
#TODO
my $uptime = SYSMON_execute($hash,"uptime");
if(defined($uptime)){
#SYSMON_Log($hash, 5, ">>>>>>>>>>>>>>>>>>>>>>".$uptime."<");
#$uptime = $1 if( $uptime && $uptime =~ m/[[:alpha:]]{2}\s+(((\d+)\D+,?\s+)?(\d+):(\d+))/ );
@@ -1470,12 +1472,15 @@ SYSMON_getUptime2($$)
my $loadavg=$6;
my ($la1, $la5, $la15, $prc, $lastpid) = split(/\s+/, trim($loadavg));
if(defined($la1) && defined($la5) && defined($la15)) {
$la1 =~ s/,$//;
$la5 =~ s/,$//;
$la1 =~ s/,/./;
$la5 =~ s/,/./;
$la15 =~ s/,/./;
$map->{+LOADAVG}="$la1 $la5 $la15";
}
}
return $map;
}
@@ -1947,16 +1952,13 @@ sub SYSMON_getRamAndSwap($$)
$map->{+RAM} = $ram;
# wenn kein swap definiert ist, ist die Groesse (total2) gleich Null. Dies wuerde eine Exception (division by zero) ausloesen
if(defined($total2) && $total2 > 0)
{
if(defined($total2) && $total2 > 0 && defined($used2) && defined($free2)) {
$total2 = $total2 / 1024;
$used2 = $used2 / 1024;
$free2 = $free2 / 1024;
$swap = sprintf("Total: %.2f MB, Used: %.2f MB, %.2f %%, Free: %.2f MB", $total2, $used2, ($used2 / $total2 * 100), $free2);
}
else
{
} else {
$swap = "n/a"
}