mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FRITZBOX: debugging improved

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12163 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
grompo
2016-09-17 08:38:20 +00:00
parent 5cc5b9d8f8
commit f8d8ae6f37
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/72_FRITZBOX.pm
View File

@@ -1315,6 +1315,7 @@ sub FRITZBOX_Readout_Run_Web($)
$result = FRITZBOX_Web_Query( $hash, $queryStr) ; $result = FRITZBOX_Web_Query( $hash, $queryStr) ;
# Abbruch wenn Fehler beim Lesen der Fritzbox-Antwort
if (defined $result->{Error}) { if (defined $result->{Error}) {
FRITZBOX_Log $hash, 2, "Error: ".$result->{Error}; FRITZBOX_Log $hash, 2, "Error: ".$result->{Error};
my $returnStr = "Error|" . $result->{Error}; my $returnStr = "Error|" . $result->{Error};
@@ -1322,6 +1323,7 @@ sub FRITZBOX_Readout_Run_Web($)
$returnStr .= "|" . join('|', @roReadings ) if int @roReadings; $returnStr .= "|" . join('|', @roReadings ) if int @roReadings;
return $name."|".encode_base64($returnStr,""); return $name."|".encode_base64($returnStr,"");
} }
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->{sid}; FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sid", $result->{sid};
FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time(); FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->sidTime", time();
@@ -4480,6 +4482,7 @@ sub FRITZBOX_Web_Query($$@)
if ($response->is_error) { if ($response->is_error) {
my %retHash = ("Error" => $response->status_line); my %retHash = ("Error" => $response->status_line);
FRITZBOX_Log $hash, 5, "Error: ".$response->status_line;
return \%retHash; return \%retHash;
} }
@@ -4500,7 +4503,8 @@ sub FRITZBOX_Web_Query($$@)
my $jsonResult ; my $jsonResult ;
if ($charSet eq "UTF-8") { if ($charSet eq "UTF-8") {
$jsonResult = JSON->new->utf8->decode( $jsonText ); $jsonResult = JSON->new->utf8->decode( $jsonText );
} else { }
else {
$jsonResult = JSON->new->latin1->decode( $jsonText ); $jsonResult = JSON->new->latin1->decode( $jsonText );
} }
$jsonResult->{sid} = $sid; $jsonResult->{sid} = $sid;