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

73_WaterCalculator: Feature - Improved Log entries

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24356 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Sailor 2021-04-29 10:44:06 +00:00
parent 6a7f91648e
commit 3701d34b6f
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/73_WaterCalculator.pm
View File

@ -455,29 +455,41 @@ sub WaterCalculator_MidnightTimer($)
my ($WaterCountName, $WaterCountReadingRegEx) = split(":", $RegEx, 2); my ($WaterCountName, $WaterCountReadingRegEx) = split(":", $RegEx, 2);
my $WaterCountDev = $defs{$WaterCountName}; my $WaterCountDev = $defs{$WaterCountName};
$WaterCountReadingRegEx =~ s/[\.\*]+$//; $WaterCountReadingRegEx =~ s/[\.\*]+$//;
$WaterCountReadingRegEx =~ s/[:]+$//;
my $WaterCountReadingRegExNeg = $WaterCountReadingRegEx . "_"; my $WaterCountReadingRegExNeg = $WaterCountReadingRegEx . "_";
my @WaterCountReadingNameListComplete = keys(%{$WaterCountDev->{READINGS}}); my @WaterCountReadingNameListComplete = keys(%{$WaterCountDev->{READINGS}});
my @WaterCountReadingNameListFiltered; my @WaterCountReadingNameListFiltered;
### Create Log entries for debugging purpose ### Create Log entries for debugging purpose
Log3 $WaterCalcName, 2, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegEx : " . $WaterCountReadingRegEx; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer WaterCountName : " . $WaterCountName;
Log3 $WaterCalcName, 2, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegExNeg : " . $WaterCountReadingRegExNeg; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer RegEx : " . $RegEx;
Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegEx : " . $WaterCountReadingRegEx;
Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegExNeg : " . $WaterCountReadingRegExNeg;
### If no RegEx is available, leave routine ### If no RegEx is available, leave routine
if (($WaterCountReadingRegEx eq "") || ($WaterCountReadingRegExNeg eq "")) { if (($WaterCountReadingRegEx eq "") || ($WaterCountReadingRegExNeg eq "")) {
Log3 $WaterCalcName, 2, $WaterCalcName. " : WaterCalculator_MidnightTimer : ERROR! No RegEx has been previously stored! Beaking midnight routine."; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer : ERROR! No RegEx has been previously stored! Beaking midnight routine.";
Log3 $WaterCalcName, 2, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegEx : " . $WaterCountReadingRegEx; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegEx : " . $WaterCountReadingRegEx;
Log3 $WaterCalcName, 2, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegExNeg : " . $WaterCountReadingRegExNeg; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer ReadingRegExNeg : " . $WaterCountReadingRegExNeg;
return; return;
} }
foreach my $WaterCountReadingName (@WaterCountReadingNameListComplete) { ### Check whether system failure threat is given or log error message
if (($WaterCountReadingName =~ m[$WaterCountReadingRegEx]) && ($WaterCountReadingName !~ m[$WaterCountReadingRegExNeg])) { eval {
push(@WaterCountReadingNameListFiltered, $WaterCountReadingName); ### For each valid RegEx entry given in the list of existing devices
foreach my $WaterCountReadingName (@WaterCountReadingNameListComplete) {
if (($WaterCountReadingName =~ m[$WaterCountReadingRegEx]) && ($WaterCountReadingName !~ m[$WaterCountReadingRegExNeg])) {
push(@WaterCountReadingNameListFiltered, $WaterCountReadingName);
}
} }
} 1;
} or do {
my $ErrorMessage = $@;
Log3 $WaterCalcName, 2, $WaterCalcName. " : Something went wrong with the RegEx : " . $ErrorMessage;
return;
};
### Create Log entries for debugging purpose ### Create Log entries for debugging purpose
Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer__________________________________________________________"; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer__________________________________________________________";
Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer : MidnightTimer initiated"; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer : MidnightTimer initiated";