diff --git a/fhem/FHEM/91_watchdog.pm b/fhem/FHEM/91_watchdog.pm index 3da5e16f6..ba400656a 100644 --- a/fhem/FHEM/91_watchdog.pm +++ b/fhem/FHEM/91_watchdog.pm @@ -19,13 +19,14 @@ watchdog_Initialize($) $hash->{NotifyFn} = "watchdog_Notify"; no warnings 'qw'; my @attrList = qw( - activateOnStart:0,1 - addStateEvent:0,1 - autoRestart:0,1 - disable:0,1 + activateOnStart:1,0 + addStateEvent:1,0 + autoRestart:1,0 + disable:1,0 disabledForIntervals execOnReactivate - regexp1WontReactivate:0,1 + regexp1WontReactivate:1,0 + regexp2WillReactivate:1,0 ); use warnings 'qw'; $hash->{AttrList} = join(" ", @attrList); @@ -123,6 +124,7 @@ watchdog_Notify($$) my $ln = $watchdog->{NAME}; return "" if(IsDisabled($ln) || $watchdog->{STATE} eq "inactive"); my $dontReAct = AttrVal($ln, "regexp1WontReactivate", 0); + my $re2act = AttrVal($ln, "regexp2WillReactivate", 0); my $n = $dev->{NAME}; my $re1 = $watchdog->{RE1}; @@ -150,7 +152,7 @@ watchdog_Notify($$) RemoveInternalTimer($watchdog); - if($re1 eq $re2 || $re1 eq ".") { + if($re1 eq $re2 || $re1 eq "." || $re2act) { watchdog_Activate($watchdog); return ""; @@ -369,7 +371,7 @@ watchdog_Set($@) Attributes