Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

91_watchdog.pm: fix activateOnStart bug (Forum #89173)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16963 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-07-09 07:40:22 +00:00
parent 5bae2b4a18
commit 48ca082344
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/91_watchdog.pm
View File

@ -39,7 +39,9 @@ watchdog_Initialize($)
my $wh = $defs{$wd};
my $aTime = ReadingsTimestamp($wd, "Activated", undef);
my $tTime = ReadingsTimestamp($wd, "Triggered", undef);
my $rTime = ReadingsTimestamp($wd, "Reset", undef);
next if(!$aTime ||
($rTime && $rTime gt $aTime) ||
($tTime && $tTime gt $aTime) ||
time_str2num($aTime)+$wh->{TO} <= $now);
my $remaining = time_str2num($aTime)+$wh->{TO};
@ -48,6 +50,13 @@ watchdog_Initialize($)
}, 1) if(!$init_done);
}
sub
watchdog_reset($)
{
my ($watchdog) = @_;
$watchdog->{STATE} = "defined";
setReadingsVal($watchdog, "Reset", "reset", TimeNow());
}
#####################################
# defined watchme watchdog reg1 timeout reg2 command
@ -91,7 +100,7 @@ watchdog_Define($$)
watchdog_Activate($watchdog)
} else {
$watchdog->{STATE} = "defined";
$watchdog->{STATE} = "defined"; # do not set the reading
}
@ -131,7 +140,7 @@ watchdog_Notify($$)
if($dotTrigger) {
RemoveInternalTimer($watchdog);
$watchdog->{STATE} = "defined";
watchdog_reset($watchdog);
return;
}
@ -146,7 +155,7 @@ watchdog_Notify($$)
return "";
} else {
$watchdog->{STATE} = "defined";
watchdog_reset($watchdog);
}
@ -161,7 +170,7 @@ watchdog_Notify($$)
}
} elsif($dotTrigger) {
$watchdog->{STATE} = "defined"; # trigger w .
watchdog_reset($watchdog); # trigger w .
}
@ -176,7 +185,7 @@ watchdog_Trigger($)
my $name = $watchdog->{NAME};
if(IsDisabled($name) || $watchdog->{STATE} eq "inactive") {
$watchdog->{STATE} = "defined";
watchdog_reset($watchdog);
return "";
}
@ -190,7 +199,7 @@ watchdog_Trigger($)
Log3 $name, 3, $ret if($ret);
if(AttrVal($name, "autoRestart", 0)) {
$watchdog->{STATE} = "defined"; # auto trigger w .
watchdog_reset($watchdog); # auto trigger w .
}
}