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

Blocking.pm: more detailed errors if define telnet goes wrong (Forum #40509)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9163 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-08-30 07:57:51 +00:00
parent 146567e7be
commit 7732b6b775
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/Blocking.pm
View File

@ -52,18 +52,16 @@ BlockingCall($$@)
# If not suitable telnet device found, create a temporary one
if(!$telnetDevice) {
if(!CommandDefine(undef, "$tName telnet 0")) {
CommandAttr(undef, "$tName room hidden");
$telnetDevice = $tName;
$defs{$tName}{TEMPORARY} = 1;
$attr{$tName}{allowfrom} = "127.0.0.1";
my $ret = CommandDefine(undef, "$tName telnet 0");
if($ret) {
$ret = "CallBlockingFn: No telnet port found and cannot create one: $ret";
Log 1, $ret;
return $ret;
}
}
if(!$telnetDevice) {
my $msg = "CallBlockingFn: No telnet port found and cannot create one.";
Log 1, $msg;
return $msg;
CommandAttr(undef, "$tName room hidden");
$telnetDevice = $tName;
$defs{$tName}{TEMPORARY} = 1;
$attr{$tName}{allowfrom} = "127.0.0.1";
}
# do fork

4
fhem/fhem.pl
View File

@ -1680,7 +1680,7 @@ CommandDefine($$)
my $ret = CallFn($name, "DefFn", \%hash, $def);
if($ret) {
Log 1, "define $name $def: $ret";
Log 1, "define $def: $ret";
delete $defs{$name}; # Veto
delete $attr{$name};
@ -2670,7 +2670,7 @@ HandleTimeout()
# Check the internal list.
foreach my $i (sort { $intAt{$a}{TRIGGERTIME} <=>
$intAt{$b}{TRIGGERTIME} } keys %intAt) {
next if(!$intAt{$i}); # deleted in the loop
next if(!defined($i) || !$intAt{$i}); # deleted in the loop
my $tim = $intAt{$i}{TRIGGERTIME};
my $fn = $intAt{$i}{FN};
if(!defined($tim) || !defined($fn)) {