mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-13 17:26:34 +00:00
Bugfixes IODEVSTATS
git-svn-id: https://svn.fhem.de/fhem/trunk@617 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
e7d61a9f97
commit
e03d9074a1
@ -4,8 +4,8 @@
|
|||||||
# Feedback: http://groups.google.com/group/fhem-users
|
# Feedback: http://groups.google.com/group/fhem-users
|
||||||
# Logging to RRDs
|
# Logging to RRDs
|
||||||
# Autor: a[PUNKT]r[BEI]oo2p[PUNKT]net
|
# Autor: a[PUNKT]r[BEI]oo2p[PUNKT]net
|
||||||
# Stand: 26.01.2010
|
# Stand: 13.04.2010
|
||||||
# Version: 0.5.0
|
# Version: 0.9.0
|
||||||
#*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
|
#*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
|
||||||
#######################################################################
|
#######################################################################
|
||||||
#*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
|
#*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
|
||||||
@ -336,7 +336,7 @@ sub RRD_Log_disptach_reading($$$) {
|
|||||||
my $changed_device_type = $defs{$changed_device}{TYPE};
|
my $changed_device_type = $defs{$changed_device}{TYPE};
|
||||||
#CUL-Weiche
|
#CUL-Weiche
|
||||||
if($changed_device_type eq "CUL" && $changed_device_type eq "FHZ" && $changed_device_type eq "CUL_RFR"){
|
if($changed_device_type eq "CUL" && $changed_device_type eq "FHZ" && $changed_device_type eq "CUL_RFR"){
|
||||||
if(!defined($data{RRD_LOG}{READING}{$changed_device_type}{$changed_reading})) {
|
if(!defined($data{RRD_LOG}{READING}{$changed_device_type})) {
|
||||||
Log $ll, "RRDLOG|Disptach|CUL_WEICHE: $changed_device Type $changed_device_type not configured";
|
Log $ll, "RRDLOG|Disptach|CUL_WEICHE: $changed_device Type $changed_device_type not configured";
|
||||||
return undef;}
|
return undef;}
|
||||||
}
|
}
|
||||||
@ -376,7 +376,7 @@ sub RRD_Log_disptach_reading($$$) {
|
|||||||
no strict "refs";
|
no strict "refs";
|
||||||
|
|
||||||
my $rrd_create_func;
|
my $rrd_create_func;
|
||||||
if($changed_device_type eq "CUL" && $changed_device_type eq "FHZ" && $changed_device_type eq "CUL_RFR"){
|
if($changed_device_type eq "CUL" || $changed_device_type eq "FHZ" || $changed_device_type eq "CUL_RFR"){
|
||||||
my $cul_reading;
|
my $cul_reading;
|
||||||
if(lc($changed_reading) =~ m/_rssi$/){$cul_reading = "rssi";}
|
if(lc($changed_reading) =~ m/_rssi$/){$cul_reading = "rssi";}
|
||||||
if(lc($changed_reading) =~ m/_msg$/){$cul_reading = "msg";}
|
if(lc($changed_reading) =~ m/_msg$/){$cul_reading = "msg";}
|
||||||
@ -386,7 +386,7 @@ sub RRD_Log_disptach_reading($$$) {
|
|||||||
}
|
}
|
||||||
else {$rrd_create_func = $data{RRD_LOG}{READING}{$changed_device_type}{$changed_reading};}
|
else {$rrd_create_func = $data{RRD_LOG}{READING}{$changed_device_type}{$changed_reading};}
|
||||||
if(!defined($rrd_create_func)){
|
if(!defined($rrd_create_func)){
|
||||||
Log $ll, "RRDLOG|Disptach|rrd_create_func|ERROR: Function not defined";
|
Log $ll, "RRDLOG[ERRROR] dispatch rrd_create_func $changed_device_type:$changed_reading Function not defined";
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
$rrd_file = &$rrd_create_func($self,$changed_device,$changed_reading,$rrd_file,$timestamp);
|
$rrd_file = &$rrd_create_func($self,$changed_device,$changed_reading,$rrd_file,$timestamp);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user