FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

Fixing endless loop if at triggers on itself.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3053 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-04-08 14:31:22 +00:00
parent d3c43adff1
commit f9185de861
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/92_FileLog.pm
View File

@ -98,7 +98,7 @@ FileLog_Log($$)
my $n = $dev->{NAME};
my $re = $log->{REGEXP};
my $max = int(@{$dev->{CHANGED}});
my $tn = $dev->{TRIGGERTIME};
my $tn = $dev->{NTFY_TRIGGERTIME};
my $ct = $dev->{CHANGETIME};
my $wrotesome;
my $fh = $log->{FH};
@ -118,7 +118,8 @@ FileLog_Log($$)
}
if($wrotesome) {
$fh->flush;
$fh->sync if !($^O eq 'MSWin32'); #not implemented in Windows
# Too much IO
# $fh->sync if !($^O eq 'MSWin32'); #not implemented in Windows
}
return "";
}

2
fhem/fhem.pl
View File

@ -2352,7 +2352,7 @@ DoTrigger($$@)
my @ntfyList = sort { $defs{$a}{NTFY_ORDER} cmp $defs{$b}{NTFY_ORDER} }
grep { $defs{$_}{NTFY_ORDER} } keys %defs;
Log 5, "Notify loop for $dev $hash->{CHANGED}->[0]";
$hash->{TRIGGERTIME} = TimeNow(); # Optimize FileLog
$hash->{NTFY_TRIGGERTIME} = TimeNow(); # Optimize FileLog
foreach my $n (@ntfyList) {
next if(!defined($defs{$n})); # Was deleted in a previous notify
my $r = CallFn($n, "NotifyFn", $defs{$n}, $hash);