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

Bugfixes IODEVSTATS

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@617 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parix 2010-04-13 19:18:33 +00:00
parent e7d61a9f97
commit e03d9074a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/contrib/rrd/95_RRD_Log.pm
View File

@ -4,8 +4,8 @@
# Feedback: http://groups.google.com/group/fhem-users
# Logging to RRDs
# Autor: a[PUNKT]r[BEI]oo2p[PUNKT]net
# Stand: 26.01.2010
# Version: 0.5.0
# Stand: 13.04.2010
# 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
@ -103,7 +103,7 @@ RRD_Log_Initialize($)
# IODEVSTATS=CUL_RFR
$data{RRD_LOG}{READING}{CUL_RFR}{'msg'} = "RRD_Log_5minCOUNTER";
$data{RRD_LOG}{READING}{CUL_RFR}{'rssi'} = "RRD_Log_5minGAUGE";
$data{RRD_LOG}{READING}{CUL_RFR}{'RAWMSGCOUNT'} = "RRD_Log_5minGAUGE";
$data{RRD_LOG}{READING}{CUL_RFR}{'RAWMSGCOUNT'} = "RRD_Log_5minGAUGE";
#WBS
$data{RRD_LOG}{READING}{WBS}{'Temperature'} = "RRD_Log_5minGAUGE";
# temp. save Path to RRDs
@ -336,7 +336,7 @@ sub RRD_Log_disptach_reading($$$) {
my $changed_device_type = $defs{$changed_device}{TYPE};
#CUL-Weiche
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";
return undef;}
}
@ -376,7 +376,7 @@ sub RRD_Log_disptach_reading($$$) {
no strict "refs";
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;
if(lc($changed_reading) =~ m/_rssi$/){$cul_reading = "rssi";}
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};}
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;
}
$rrd_file = &$rrd_create_func($self,$changed_device,$changed_reading,$rrd_file,$timestamp);