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

98_autocreate.pm: fix autocreateThreshold warnings (Forum #36040)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8758 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-06-16 17:12:39 +00:00
parent 548ade227a
commit 7f4bd01e53
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/98_autocreate.pm
View File

@ -144,8 +144,8 @@ autocreate_Notify($$)
if( !@v ) { if( !@v ) {
if( my $fp = $modules{$t}{AutoCreate} ) { if( my $fp = $modules{$t}{AutoCreate} ) {
foreach my $k (keys %{$fp}) { foreach my $k (keys %{$fp}) {
next if($name !~ m/^$k$/); next if($name !~ m/^$k$/ || !$fp->{$k}{autocreateThreshold});
(undef, $interval) = split( ':', $fp->{$k}{autocreateThreshold} ); (undef, $interval) = split( ':',$fp->{$k}{autocreateThreshold});
last; last;
} }
} }
@ -155,12 +155,13 @@ autocreate_Notify($$)
foreach my $a (keys %{$hash->{received}{$t}}) { foreach my $a (keys %{$hash->{received}{$t}}) {
foreach my $time (keys %{$hash->{received}{$t}{$a}}) { foreach my $time (keys %{$hash->{received}{$t}{$a}}) {
if( $time < $now - $interval ) { if( $time < $now - $interval ) {
#Log3 $me, 5, "autocreate: removed event for '$t $a' with timestamp $time"; #Log3 $me, 5,
# "autocreate: removed event for '$t $a' with timestamp $time";
delete( $hash->{received}{$t}{$a}{$time} ); delete( $hash->{received}{$t}{$a}{$time} );
} }
} }
delete( $hash->{received}{$t}{$a} ) if( !%{$hash->{received}{$t}{$a}} ); delete($hash->{received}{$t}{$a}) if(!%{$hash->{received}{$t}{$a}});
} }
delete( $hash->{received}{$t} ) if( !%{$hash->{received}{$t}} ); delete( $hash->{received}{$t} ) if( !%{$hash->{received}{$t}} );
@ -176,8 +177,9 @@ autocreate_Notify($$)
if( !@v ) { if( !@v ) {
if( my $fp = $modules{$type}{AutoCreate} ) { if( my $fp = $modules{$type}{AutoCreate} ) {
foreach my $k (keys %{$fp}) { foreach my $k (keys %{$fp}) {
next if($name !~ m/^$k$/); next if($name !~ m/^$k$/ || !$fp->{$k}{autocreateThreshold});
($min_count, $interval) = split( ':', $fp->{$k}{autocreateThreshold} ); ($min_count, $interval) =
split(':', $fp->{$k}{autocreateThreshold});
last; last;
} }
} }
@ -189,11 +191,12 @@ autocreate_Notify($$)
$hash->{received}{$type}{$arg}{$now} = 1; $hash->{received}{$type}{$arg}{$now} = 1;
my $count = keys %{$hash->{received}{$type}{$arg}}; my $count = keys %{$hash->{received}{$type}{$arg}};
Log3 $me, 4, "autocreate: received $count event(s) for '$type $arg' during the last $interval seconds"; Log3 $me, 4, "autocreate: received $count event(s) for ".
"'$type $arg' during the last $interval seconds";
if( $count < $min_count ) { if( $count < $min_count ) {
Log3 $me, 4, "autocreate: ignoring event for '$type $arg': at least $min_count needed"; Log3 $me, 4, "autocreate: ignoring event for ".
"'$type $arg': at least $min_count needed";
next; next;
} }
@ -666,9 +669,10 @@ autocreate_Attr(@)
<a name="autocreateThreshold"></a> <a name="autocreateThreshold"></a>
<li>autocreateThreshold<br> <li>autocreateThreshold<br>
A list of &lt;type&gt;:&lt;count&gt;:&lt;interval&gt; triplets. A new A list of &lt;type&gt;:&lt;count&gt;:&lt;interval&gt; triplets. A new
device is only created if there have been at least <code>count</code> events device is only created if there have been at least <code>count</code>
of TYPE <code>type</code> in the last <code>interval</code> seconds.<br> events of TYPE <code>type</code> in the last <code>interval</code>
<code>attr autocreateThreshold LaCrosse:2:30,EMT7110:2:60</code> seconds.<br> <code>attr autocreateThreshold
LaCrosse:2:30,EMT7110:2:60</code>
</li> </li>
</ul> </ul>
@ -829,8 +833,8 @@ autocreate_Attr(@)
<li>autocreateThreshold<br> <li>autocreateThreshold<br>
Eine Liste of &lt;type&gt;:&lt;count&gt;:&lt;interval&gt; tripeln. Ein Eine Liste of &lt;type&gt;:&lt;count&gt;:&lt;interval&gt; tripeln. Ein
neues Device wird nur dann erzeugt wenn es mindestens <code>count</code> neues Device wird nur dann erzeugt wenn es mindestens <code>count</code>
Events für den TYPE <code>type</code> in den letzten <code>interval</code> Events f&uuml;r den TYPE <code>type</code> in den letzten
Sekunden gegeben hat.<br> <code>interval</code> Sekunden gegeben hat.<br>
Beispiel:<br> Beispiel:<br>
<code>attr autocreateThreshold LaCrosse:2:30,EMT7110:2:60</code> <code>attr autocreateThreshold LaCrosse:2:30,EMT7110:2:60</code>
</li> </li>