FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

cosmetic changes.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1977 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-10-16 05:44:00 +00:00
parent e16d311743
commit b81da2b843
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
fhem/FHEM/91_watchdog.pm
View File

@ -24,7 +24,7 @@ watchdog_Initialize($)
sub sub
watchdog_Define($$) watchdog_Define($$)
{ {
my ($ntfy, $def) = @_; my ($watchdog, $def) = @_;
my ($name, $type, $re1, $to, $re2, $command) = split("[ \t]+", $def, 6); my ($name, $type, $re1, $to, $re2, $command) = split("[ \t]+", $def, 6);
return "Usage: define <name> watchdog <re1> <timeout> <re2> <command>" return "Usage: define <name> watchdog <re1> <timeout> <re2> <command>"
@ -41,17 +41,17 @@ watchdog_Define($$)
if($to !~ m/^(\d\d):(\d\d)(:\d\d)?$/); if($to !~ m/^(\d\d):(\d\d)(:\d\d)?$/);
$to = $1*3600+$2*60+($3 ? substr($3,1) : 0); $to = $1*3600+$2*60+($3 ? substr($3,1) : 0);
$ntfy->{RE1} = $re1; $watchdog->{RE1} = $re1;
$ntfy->{RE2} = $re2; $watchdog->{RE2} = $re2;
$ntfy->{TO} = $to; $watchdog->{TO} = $to;
$ntfy->{CMD} = $command; $watchdog->{CMD} = $command;
if($re1 eq ".") { if($re1 eq ".") {
watchdog_Activate($ntfy) watchdog_Activate($watchdog)
} else { } else {
$ntfy->{STATE} = "defined"; $watchdog->{STATE} = "defined";
} }
@ -62,49 +62,49 @@ watchdog_Define($$)
sub sub
watchdog_Notify($$) watchdog_Notify($$)
{ {
my ($ntfy, $dev) = @_; my ($watchdog, $dev) = @_;
my $ln = $ntfy->{NAME}; my $ln = $watchdog->{NAME};
return "" if($attr{$ln} && $attr{$ln}{disable}); return "" if($attr{$ln} && $attr{$ln}{disable});
my $dontReAct = AttrVal($ln, "regexp1WontReactivate", 0);
my $n = $dev->{NAME}; my $n = $dev->{NAME};
my $re1 = $ntfy->{RE1}; my $re1 = $watchdog->{RE1};
my $re2 = $ntfy->{RE2}; my $re2 = $watchdog->{RE2};
my $max = int(@{$dev->{CHANGED}}); my $max = int(@{$dev->{CHANGED}});
for (my $i = 0; $i < $max; $i++) { for (my $i = 0; $i < $max; $i++) {
my $s = $dev->{CHANGED}[$i]; my $s = $dev->{CHANGED}[$i];
$s = "" if(!defined($s)); $s = "" if(!defined($s));
my $dotTrigger = ($ln eq $n && $s eq "."); # trigger w . my $dotTrigger = ($ln eq $n && $s eq "."); # trigger w .
my $dontReAct = AttrVal($ln, "regexp1WontReactivate", 0);
if($ntfy->{STATE} =~ m/Next:/) { if($watchdog->{STATE} =~ m/Next:/) {
if($n =~ m/^$re2$/ || "$n:$s" =~ m/^$re2$/) { if($n =~ m/^$re2$/ || "$n:$s" =~ m/^$re2$/) {
RemoveInternalTimer($ntfy); RemoveInternalTimer($watchdog);
if(($re1 eq $re2 || $re1 eq ".") && !$dontReAct) { if(($re1 eq $re2 || $re1 eq ".") && !$dontReAct) {
watchdog_Activate($ntfy); watchdog_Activate($watchdog);
return ""; return "";
} else { } else {
$ntfy->{STATE} = "defined"; $watchdog->{STATE} = "defined";
} }
} elsif($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/) { } elsif($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/) {
watchdog_Activate($ntfy) if(!$dontReAct); watchdog_Activate($watchdog) if(!$dontReAct);
} }
} elsif($ntfy->{STATE} eq "defined") { } elsif($watchdog->{STATE} eq "defined") {
if($dotTrigger || # trigger w . if($dotTrigger || # trigger w .
($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/)) { ($n =~ m/^$re1$/ || "$n:$s" =~ m/^$re1$/)) {
watchdog_Activate($ntfy) watchdog_Activate($watchdog)
} }
} elsif($dotTrigger) { } elsif($dotTrigger) {
$ntfy->{STATE} = "defined"; # trigger w . $watchdog->{STATE} = "defined"; # trigger w .
} }
@ -115,13 +115,13 @@ watchdog_Notify($$)
sub sub
watchdog_Trigger($) watchdog_Trigger($)
{ {
my ($ntfy) = @_; my ($watchdog) = @_;
Log(3, "Watchdog $ntfy->{NAME} triggered"); Log(3, "Watchdog $watchdog->{NAME} triggered");
my $exec = SemicolonEscape($ntfy->{CMD});; my $exec = SemicolonEscape($watchdog->{CMD});;
$ntfy->{STATE} = "triggered"; $watchdog->{STATE} = "triggered";
$ntfy->{READINGS}{Triggered}{TIME} = TimeNow(); $watchdog->{READINGS}{Triggered}{TIME} = TimeNow();
$ntfy->{READINGS}{Triggered}{VAL} = $ntfy->{STATE}; $watchdog->{READINGS}{Triggered}{VAL} = $watchdog->{STATE};
my $ret = AnalyzeCommandChain(undef, $exec); my $ret = AnalyzeCommandChain(undef, $exec);
Log 3, $ret if($ret); Log 3, $ret if($ret);
@ -130,11 +130,11 @@ watchdog_Trigger($)
sub sub
watchdog_Activate($) watchdog_Activate($)
{ {
my ($ntfy) = @_; my ($watchdog) = @_;
my $nt = gettimeofday() + $ntfy->{TO}; my $nt = gettimeofday() + $watchdog->{TO};
$ntfy->{STATE} = "Next: " . FmtTime($nt); $watchdog->{STATE} = "Next: " . FmtTime($nt);
RemoveInternalTimer($ntfy); RemoveInternalTimer($watchdog);
InternalTimer($nt, "watchdog_Trigger", $ntfy, 0) InternalTimer($nt, "watchdog_Trigger", $watchdog, 0)
} }
sub sub