Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

PRESENCE: don't start a local scan in AttrFn before DefineFn has completed.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5031 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2014-02-23 21:41:47 +00:00
parent 787d16c20e
commit 790af1413f
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fhem/FHEM/73_PRESENCE.pm
View File

@ -264,6 +264,7 @@ PRESENCE_Set($@)
{ {
if($hash->{MODE} ne "lan-bluetooth") if($hash->{MODE} ne "lan-bluetooth")
{ {
Log3 $hash->{NAME}, 5, "PRESENCE (".$hash->{NAME}.") - starting local scan";
PRESENCE_StartLocalScan($hash, 1); PRESENCE_StartLocalScan($hash, 1);
return undef; return undef;
} }
@ -467,31 +468,48 @@ PRESENCE_Ready($)
sub PRESENCE_StartLocalScan($;$) sub PRESENCE_StartLocalScan($;$)
{ {
my ($hash, $local) = @_; my ($hash, $local) = @_;
my $name = $hash->{NAME};
my $mode = $hash->{MODE};
$local = 0 unless(defined($local)); $local = 0 unless(defined($local));
if(not (exists($hash->{ADDRESS}) or exists($hash->{helper}{call})))
{
return;
}
$hash->{STATE} = "active" if($hash->{STATE} eq "???"); $hash->{STATE} = "active" if($hash->{STATE} eq "???");
if(not $local)
{
Log3 $name, 5, "PRESENCE ($name) - resetting Timer";
RemoveInternalTimer($hash);
}
if($hash->{MODE} eq "local-bluetooth") if($mode eq "local-bluetooth")
{ {
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalBluetoothScan", $hash->{NAME}."|".$hash->{ADDRESS}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID})); Log3 $name, 5, "PRESENCE ($name) - starting Blocking call for mode local-bluetooth";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalBluetoothScan", $name."|".$hash->{ADDRESS}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
} }
elsif($hash->{MODE} eq "lan-ping") elsif($mode eq "lan-ping")
{ {
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalPingScan", $hash->{NAME}."|".$hash->{ADDRESS}."|".$local."|".AttrVal($hash->{NAME}, "ping_count", "4"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID})); Log3 $name, 5, "PRESENCE ($name) - starting Blocking call for mode lan-ping";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalPingScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "ping_count", "4"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
} }
elsif($hash->{MODE} eq "fritzbox") elsif($mode eq "fritzbox")
{ {
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFritzBoxScan", $hash->{NAME}."|".$hash->{ADDRESS}."|".$local."|".AttrVal($hash->{NAME}, "fritzbox_repeater", "0"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID})); Log3 $name, 5, "PRESENCE ($name) - starting Blocking call for mode fritzbox";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFritzBoxScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "fritzbox_repeater", "0"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
} }
elsif($hash->{MODE} eq "shellscript") elsif($mode eq "shellscript")
{ {
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalShellScriptScan", $hash->{NAME}."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID})); Log3 $name, 5, "PRESENCE ($name) - starting Blocking call for mode shellscript";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalShellScriptScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
} }
elsif($hash->{MODE} eq "function") elsif($mode eq "function")
{ {
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFunctionScan", $hash->{NAME}."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID})); Log3 $name, 5, "PRESENCE ($name) - starting Blocking call for mode function";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFunctionScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash) unless(exists($hash->{helper}{RUNNING_PID}));
} }
} }