FRITZBOX: debugging improved

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@7164 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-12-07 17:05:47 +00:00
parent 58c85f337d
commit 182d651a3f

View File

@ -121,8 +121,8 @@ FRITZBOX_Log($$$)
Log3 $hash, $loglevel, "FRITZBOX $instName: $sub.$xline " . $text; Log3 $hash, $loglevel, "FRITZBOX $instName: $sub.$xline " . $text;
} }
sub ########################################## ##########################################
FRITZBOX_Initialize($) sub FRITZBOX_Initialize($)
{ {
my ($hash) = @_; my ($hash) = @_;
@ -143,8 +143,8 @@ FRITZBOX_Initialize($)
} # end FRITZBOX_Initialize } # end FRITZBOX_Initialize
sub ########################################## ##########################################
FRITZBOX_Define($$) sub FRITZBOX_Define($$)
{ {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @args = split("[ \t][ \t]*", $def); my @args = split("[ \t][ \t]*", $def);
@ -159,11 +159,9 @@ FRITZBOX_Define($$)
unless ( -X "/usr/bin/ctlmgr_ctl" ) unless ( -X "/usr/bin/ctlmgr_ctl" )
{ {
$msg = "Error - FHEM needs to run on a Fritz!Box to use the FRITZBOX module";
$hash->{REMOTE} = 1; $hash->{REMOTE} = 1;
$hash->{HOST} = "fritz.box"; $hash->{HOST} = "fritz.box";
# FRITZBOX_Log $hash, 1, $msg; FRITZBOX_Log $hash, 4, "FRITZBOX runs in remote mode";
# return $msg;
} }
elsif ( $< != 0 ) elsif ( $< != 0 )
{ {
@ -176,6 +174,7 @@ FRITZBOX_Define($$)
else else
{ {
$hash->{REMOTE} = 0; $hash->{REMOTE} = 0;
FRITZBOX_Log $hash, 4, "FRITZBOX runs in local mode";
} }
$hash->{STATE} = "Initializing"; $hash->{STATE} = "Initializing";
@ -1103,6 +1102,7 @@ sub FRITZBOX_Telnet_Open($)
if (!$telnet) { if (!$telnet) {
$msg = "Error while opening telnet connection: ".$telnet->errmsg; $msg = "Error while opening telnet connection: ".$telnet->errmsg;
FRITZBOX_Log $hash, 2, $msg; FRITZBOX_Log $hash, 2, $msg;
$telnet = undef;
return $msg; return $msg;
} }
@ -1113,6 +1113,8 @@ sub FRITZBOX_Telnet_Open($)
{ {
$msg = "Error while waiting for user prompt: ".$telnet->errmsg; $msg = "Error while waiting for user prompt: ".$telnet->errmsg;
FRITZBOX_Log $hash, 2, $msg; FRITZBOX_Log $hash, 2, $msg;
$telnet->close;
$telnet = undef;
return $msg; return $msg;
} }
FRITZBOX_Log $hash, 5, "Telnet: Entering user"; FRITZBOX_Log $hash, 5, "Telnet: Entering user";
@ -1124,6 +1126,8 @@ sub FRITZBOX_Telnet_Open($)
{ {
$msg = "Error while waiting for password prompt: ".$telnet->errmsg; $msg = "Error while waiting for password prompt: ".$telnet->errmsg;
FRITZBOX_Log $hash, 2, $msg; FRITZBOX_Log $hash, 2, $msg;
$telnet->close;
$telnet = undef;
return $msg; return $msg;
} }
FRITZBOX_Log $hash, 5, "Telnet: Entering password"; FRITZBOX_Log $hash, 5, "Telnet: Entering password";
@ -1134,6 +1138,8 @@ sub FRITZBOX_Telnet_Open($)
{ {
$msg = "Error while waiting for command prompt: ".$telnet->errmsg; $msg = "Error while waiting for command prompt: ".$telnet->errmsg;
FRITZBOX_Log $hash, 2, $msg; FRITZBOX_Log $hash, 2, $msg;
$telnet->close;
$telnet = undef;
return $msg; return $msg;
} }