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

Fix: Log Warnings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4694 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister 2014-01-19 20:16:31 +00:00
parent 53699c22ee
commit 8d16e24e57
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- SVN - SVN
- bugfix: SYSMON: Log Warnings
- feature: Setting of controller parameter now possible for LUXTRONIK2 - feature: Setting of controller parameter now possible for LUXTRONIK2
- feature: new module 71_YAMAHA_BD.pm to control Yamaha Blu-Ray - feature: new module 71_YAMAHA_BD.pm to control Yamaha Blu-Ray
players over network. players over network.

28
fhem/FHEM/42_SYSMON.pm
View File

@ -30,7 +30,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $VERSION = "1.2.1"; my $VERSION = "1.2.2";
use constant { use constant {
DATE => "date", DATE => "date",
@ -823,7 +823,7 @@ sub SYSMON_getFileSystemInfo ($$$)
} }
#my $disk = "df ".$fs." -m 2>&1"; # in case of failure get string from stderr #my $disk = "df ".$fs." -m 2>&1"; # in case of failure get string from stderr
my $disk = "df ".$fs." -m"; my $disk = "df ".$fs." -m 2>/dev/null";
logF($hash, "SYSMON_getFileSystemInfo", "exec $disk"); logF($hash, "SYSMON_getFileSystemInfo", "exec $disk");
@ -832,7 +832,7 @@ sub SYSMON_getFileSystemInfo ($$$)
logF($hash, "SYSMON_getFileSystemInfo", "recieved ".scalar(scalar(@filesystems))." lines"); logF($hash, "SYSMON_getFileSystemInfo", "recieved ".scalar(scalar(@filesystems))." lines");
if(!defined @filesystems) { return $map; } # Ausgabe leer #if(!defined @filesystems) { return $map; } # Ausgabe leer
if(scalar(@filesystems) == 0) { return $map; } # Array leer if(scalar(@filesystems) == 0) { return $map; } # Array leer
logF($hash, "SYSMON_getFileSystemInfo", "recieved line0 $filesystems[0]"); logF($hash, "SYSMON_getFileSystemInfo", "recieved line0 $filesystems[0]");
@ -877,7 +877,7 @@ sub SYSMON_getFileSystemInfo ($$$)
sub SYSMON_getNetworkInfo ($$$) sub SYSMON_getNetworkInfo ($$$)
{ {
my ($hash, $map, $device) = @_; my ($hash, $map, $device) = @_;
logF($hash, "SYSMON_getNetworkInfo", "get $device");
my($nName, $nDef) = split(/:/, $device); my($nName, $nDef) = split(/:/, $device);
if(!defined $nDef) { if(!defined $nDef) {
$nDef = $nName; $nDef = $nName;
@ -950,9 +950,9 @@ sub SYSMON_ShowValuesHTML ($;@)
my ($name, @data) = @_; my ($name, @data) = @_;
my $hash = $main::defs{$name}; my $hash = $main::defs{$name};
SYSMON_updateCurrentReadingsMap($hash); SYSMON_updateCurrentReadingsMap($hash);
log 3, "SYSMON $>name, @data<"; #Log 3, "SYSMON $>name, @data<";
my @dataDescription = @data; my @dataDescription = @data;
if(!defined @data) { if(scalar(@data)<=0) {
# Array mit anzuzeigenden Parametern (Prefix, Name (in Map), Postfix) # Array mit anzuzeigenden Parametern (Prefix, Name (in Map), Postfix)
@dataDescription = (DATE, @dataDescription = (DATE,
CPU_TEMP.":".$cur_readings_map->{+CPU_TEMP}.":"." &deg;C", CPU_TEMP.":".$cur_readings_map->{+CPU_TEMP}.":"." &deg;C",
@ -1016,7 +1016,7 @@ log 3, "SYSMON $>name, @data<";
} }
# nur Default (also alles anzeigen) # nur Default (also alles anzeigen)
if(!defined @data) { if(scalar(@data)<=0) {
## network-interfaces ## network-interfaces
#my $networks = AttrVal($name, "network-interfaces", undef); #my $networks = AttrVal($name, "network-interfaces", undef);
#if(defined $networks) { #if(defined $networks) {
@ -1133,13 +1133,13 @@ sub logF($$$)
Log 5, "SYSMON $fname $msg"; Log 5, "SYSMON $fname $msg";
} }
sub trim($) #sub trim($)
{ #{
my $string = shift; # my $string = shift;
$string =~ s/^\s+//; # $string =~ s/^\s+//;
$string =~ s/\s+$//; # $string =~ s/\s+$//;
return $string; # return $string;
} #}
1; 1;