FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

98_DOIF.pm: new reading: warning, More information on warning in log

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13703 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2017-03-14 19:26:03 +00:00
parent afc6da9020
commit 5e5aa5a1a7
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/98_DOIF.pm
View File

@ -59,7 +59,7 @@ DOIF_delAll($)
#delete ($hash->{state});
#delete ($defs{$hash->{NAME}}{READINGS});
foreach my $key (keys %{$defs{$hash->{NAME}}{READINGS}}) {
delete $defs{$hash->{NAME}}{READINGS}{$key} if ($key =~ "^(Device|state|error|cmd|e_|timer_|wait_|matched_|last_cmd|mode)");
delete $defs{$hash->{NAME}}{READINGS}{$key} if ($key =~ "^(Device|state|error|warning|cmd|e_|timer_|wait_|matched_|last_cmd|mode)");
}
}
@ -1067,11 +1067,23 @@ DOIF_CheckCond($$)
# $idx++;
#}
}
$cmdFromAnalyze="$hash->{NAME}: ".sprintf("warning in condition c%02d",($condition+1));
$lastWarningMsg="";
my $ret = eval $command;
if($@){
$err = "perl error in condition: $hash->{condition}{$condition}: $@";
$@ =~ s/^(.*) at \(eval.*\)(.*)$/$1,$2/;
$err = sprintf("condition c%02d",($condition+1)).": $@";
$ret = 0;
}
if ($lastWarningMsg) {
$lastWarningMsg =~ s/^(.*) at \(eval.*$/$1/;
readingsSingleUpdate ($hash, "warning", sprintf("condition c%02d",($condition+1)).": $lastWarningMsg",0);
} else {
delete ($defs{$hash->{NAME}}{READINGS}{warning});
}
$lastWarningMsg="";
$cmdFromAnalyze = undef;
return ($ret,$err);
}
@ -3384,6 +3396,10 @@ Hier passiert das nicht mehr, da die ursprünglichen Zustände cmd_1 und cmd_2 j
<dt>wait_timer</dt>
<dd>Angabe des aktuellen Wait-Timers</dd>
</br>
<dt>warning</dt>
<dd>Perl-Warnung bei der Auswertung einer Bedingung</dd>
</br>
<a name="DOIF_Benutzerreadings"></a>
<dt>&lt;A-Z&gt;_&lt;readingname&gt;</dt>
<dd>Readings, die mit einem Großbuchstaben und nachfolgendem Unterstrich beginnen, sind für User reserviert und werden auch zuk&uuml;nftig nicht vom Modul selbst benutzt.</dd>