Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

91_watchdog.pm: execOnReactivate (Forum #29671)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@7108 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-12-01 08:11:34 +00:00
parent 30f1da3492
commit a4166077b6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/91_watchdog.pm
View File

@ -15,7 +15,7 @@ watchdog_Initialize($)
$hash->{DefFn} = "watchdog_Define"; $hash->{DefFn} = "watchdog_Define";
$hash->{UndefFn} = "watchdog_Undef"; $hash->{UndefFn} = "watchdog_Undef";
$hash->{NotifyFn} = "watchdog_Notify"; $hash->{NotifyFn} = "watchdog_Notify";
$hash->{AttrList} = "disable:0,1 disabledForIntervals execOnActivate ". $hash->{AttrList} = "disable:0,1 disabledForIntervals execOnReactivate ".
"regexp1WontReactivate:0,1 addStateEvent:0,1"; "regexp1WontReactivate:0,1 addStateEvent:0,1";
} }
@ -140,8 +140,7 @@ watchdog_Trigger($)
my $exec = SemicolonEscape($watchdog->{CMD}); my $exec = SemicolonEscape($watchdog->{CMD});
$watchdog->{STATE} = "triggered"; $watchdog->{STATE} = "triggered";
$watchdog->{READINGS}{Triggered}{TIME} = TimeNow(); setReadingsVal($watchdog, "Triggered", "triggered", TimeNow());
$watchdog->{READINGS}{Triggered}{VAL} = $watchdog->{STATE};
my $ret = AnalyzeCommandChain(undef, $exec); my $ret = AnalyzeCommandChain(undef, $exec);
Log3 $name, 3, $ret if($ret); Log3 $name, 3, $ret if($ret);
@ -156,9 +155,16 @@ watchdog_Activate($)
RemoveInternalTimer($watchdog); RemoveInternalTimer($watchdog);
InternalTimer($nt, "watchdog_Trigger", $watchdog, 0); InternalTimer($nt, "watchdog_Trigger", $watchdog, 0);
my $eoa = AttrVal($watchdog->{NAME}, "execOnActivate", undef); my $eor = AttrVal($watchdog->{NAME}, "execOnReactivate", undef);
return if(!$eoa); if($eor) {
AnalyzeCommandChain(undef, SemicolonEscape($eoa)); my $wName = $watchdog->{NAME};
my $aTime = ReadingsTimestamp($wName, "Activated", "");
my $tTime = ReadingsTimestamp($wName, "Triggered", "");
$eor = undef if(!$aTime || !$tTime || $aTime ge $tTime)
}
setReadingsVal($watchdog, "Activated", "activated", TimeNow());
AnalyzeCommandChain(undef, SemicolonEscape($eor)) if($eor);
} }
sub sub
@ -252,9 +258,10 @@ watchdog_Undef($$)
When a watchdog is active, a second event matching regexp1 will When a watchdog is active, a second event matching regexp1 will
normally reset the timeout. Set this attribute to prevents this.</li> normally reset the timeout. Set this attribute to prevents this.</li>
<li><a href="#execOnActivate">execOnActivate</a> <li><a href="#execOnReactivate">execOnActivate</a>
If set, its value will be executed as a FHEM command when the watchdog is If set, its value will be executed as a FHEM command when the watchdog is
activated by receiving an event matching regexp1.</li> reactivated (after triggering) by receiving an event matching regexp1.
</li>
</ul> </ul>
<br> <br>
</ul> </ul>
@ -359,10 +366,10 @@ watchdog_Undef($$)
passt normalerweise den Timer zur&uuml;cksetzen. Dieses Attribut wird passt normalerweise den Timer zur&uuml;cksetzen. Dieses Attribut wird
das verhindern.</li> das verhindern.</li>
<li><a href="#execOnActivate">execOnActivate</a> <li><a href="#execOnReactivate">execOnActivate</a>
Falls gesetzt, wird der Wert des Attributes als FHEM Befehl Falls gesetzt, wird der Wert des Attributes als FHEM Befehl
ausgef&uuml;hrt, wenn ein regexp1 Ereignis den Watchdog ausgef&uuml;hrt, wenn ein regexp1 Ereignis den Watchdog
aktiviert.</li> aktiviert nachdem er ausgel&ouml;st wurde.</li>
</ul> </ul>
<br> <br>
</ul> </ul>