mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-01 07:19:24 +00:00
98_monitoring: readd parameters vor error etc. functions (#127669)
git-svn-id: https://svn.fhem.de/fhem/trunk@26048 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
f25a93ad7c
commit
dc48ecfefd
@ -337,9 +337,7 @@ sub Notify {
|
|||||||
my $removeMatch = $removeRegex ? "$name:$event" =~ m{\A$removeRegex\z}xms : 0;
|
my $removeMatch = $removeRegex ? "$name:$event" =~ m{\A$removeRegex\z}xms : 0;
|
||||||
#Log3($hash, 3, "notify called with add $addMatch and remove $removeMatch");
|
#Log3($hash, 3, "notify called with add $addMatch and remove $removeMatch");
|
||||||
|
|
||||||
#next unless(defined($event) && ($addMatch || $removeMatch));
|
|
||||||
next if !$addMatch && !$removeMatch;
|
next if !$addMatch && !$removeMatch;
|
||||||
#Log3($hash, 3, "notify unless 1 replacement passed w. $addMatch and remove $removeMatch");
|
|
||||||
|
|
||||||
Log3($SELF, 4 , "$TYPE ($SELF) triggered by \"$name $event\"");
|
Log3($SELF, 4 , "$TYPE ($SELF) triggered by \"$name $event\"");
|
||||||
|
|
||||||
@ -350,8 +348,11 @@ sub Notify {
|
|||||||
|
|
||||||
my $cmd = AttrVal($SELF, $list.'Wait', 0);
|
my $cmd = AttrVal($SELF, $list.'Wait', 0);
|
||||||
my %specials = (
|
my %specials = (
|
||||||
'$name' => $name, #Name des Event auslösenden Gerätes
|
'$name' => $name, #Name des Event auslösenden Gerätes
|
||||||
'$SELF' => $SELF, #Eigenname des monitoring
|
'$SELF' => $SELF, #Eigenname des monitoring
|
||||||
|
'$event' => $event,
|
||||||
|
'$addMatch' => $addMatch,
|
||||||
|
'$removeMatch' => $removeMatch
|
||||||
);
|
);
|
||||||
|
|
||||||
$cmd = EvalSpecials($cmd, %specials);
|
$cmd = EvalSpecials($cmd, %specials);
|
||||||
|
Loading…
Reference in New Issue
Block a user