Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

30_HUEBridge.pm: better json error handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11228 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-04-11 16:58:49 +00:00
parent d10d400e62
commit d8ccdf87d6
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/30_HUEBridge.pm
View File

@ -74,7 +74,8 @@ HUEBridge_Detect($)
my $host = ''; my $host = '';
if( defined($ret) && $ret ne '' && $ret =~ m/^[\[{].*[\]}]$/ ) { if( defined($ret) && $ret ne '' && $ret =~ m/^[\[{].*[\]}]$/ ) {
my $obj = from_json($ret); my $obj = eval { from_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
if( defined($obj->[0]) if( defined($obj->[0])
&& defined($obj->[0]->{'internalipaddress'}) ) { && defined($obj->[0]->{'internalipaddress'}) ) {
@ -850,7 +851,7 @@ HUEBridge_HTTP_Call($$$;$)
Log3 $name, 2, "$name: empty answer received for $uri"; Log3 $name, 2, "$name: empty answer received for $uri";
return undef; return undef;
} elsif( $ret !~ m/^[\[{].*[\]}]$/ ) { } elsif( $ret !~ m/^[\[{].*[\]}]$/ ) {
Log3 $name, 2, "$name: invalid json detected for $uri: ". Dumper $ret; Log3 $name, 2, "$name: invalid json detected for $uri: $ret";
return undef; return undef;
} }
@ -910,7 +911,19 @@ HUEBridge_HTTP_Call2($$$$;$)
data => $obj, data => $obj,
}); });
return HUEBridge_ProcessResponse($hash,from_json($data)); if( !$data ) {
Log3 $name, 2, "$name: empty answer received for $url";
return undef;
} elsif( $data !~ m/^[\[{].*[\]}]$/ ) {
Log3 $name, 2, "$name: invalid json detected for $url: $data";
return undef;
}
my $json = eval { from_json($data) };
Log3 $name, 2, "$name: json error: $@ in $data" if( $@ );
return undef if( !$json );
return HUEBridge_ProcessResponse($hash, $json);
HUEBridge_dispatch( {hash=>$hash,chash=>$chash,type=>$path},$err,$data ); HUEBridge_dispatch( {hash=>$hash,chash=>$chash,type=>$path},$err,$data );
} else { } else {
@ -936,7 +949,7 @@ HUEBridge_HTTP_Call2($$$$;$)
sub sub
HUEBridge_dispatch($$$;$) HUEBridge_dispatch($$$;$)
{ {
my ($param, $err, $data,$json) = @_; my ($param, $err, $data, $json) = @_;
my $hash = $param->{hash}; my $hash = $param->{hash};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -955,7 +968,12 @@ HUEBridge_dispatch($$$;$)
my $queryAfterSet = AttrVal( $name,'queryAfterSet', 0 ); my $queryAfterSet = AttrVal( $name,'queryAfterSet', 0 );
$json = from_json($data) if( !$json ); if( !$json ) {
$json = eval { from_json($data) } if( !$json );
Log3 $name, 2, "$name: json error: $@ in $data" if( $@ );
}
return undef if( !$json );
my $type = $param->{type}; my $type = $param->{type};
if( ref($json) eq 'ARRAY' ) if( ref($json) eq 'ARRAY' )