From f9185de8617981ca8a4044a49256a1f4e99be3f9 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 8 Apr 2013 14:31:22 +0000
Subject: [PATCH] Fixing endless loop if at triggers on itself.
git-svn-id: https://svn.fhem.de/fhem/trunk@3053 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/92_FileLog.pm | 5 +++--
fhem/fhem.pl | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm
index 0ba7b32bc..af271961b 100755
--- a/fhem/FHEM/92_FileLog.pm
+++ b/fhem/FHEM/92_FileLog.pm
@@ -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 "";
}
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 195000d29..229add138 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -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);