Public/FHEM-Tado
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

changed api status check

Browse Source 
maybe a blocking problem could be solved
This commit is contained in:
Philipp Wo 2019-12-10 09:31:43 +01:00
parent 00596dd93a
commit 4b7a09ff0b
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
98_TadoAPI.pm
View File

@ -368,25 +368,6 @@ sub TadoAPI_Undefine($$) {
return undef; return undef;
} }
sub TadoAPI_OnlineStatus(@){
my ($hash) = @_;
my $name = $hash->{NAME};
# test api status
my $param = {
url => $AuthURL,
timeout => 5,
hash => $hash,
method => "GET",
header => "",
callback => \&TadoAPI_callback
};
#test if api is reachable
HttpUtils_NonblockingGet($param);
return undef;
}
sub TadoAPI_LoadToken(@){ sub TadoAPI_LoadToken(@){
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -395,8 +376,6 @@ sub TadoAPI_LoadToken(@){
$tokenLifeTime = 0 if(!defined $tokenLifeTime || $tokenLifeTime eq ''); $tokenLifeTime = 0 if(!defined $tokenLifeTime || $tokenLifeTime eq '');
my $Token = undef; my $Token = undef;
TadoAPI_OnlineStatus($hash);
if($apiStatus){ if($apiStatus){
eval { eval {
open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!"); open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!");
@ -415,8 +394,19 @@ sub TadoAPI_LoadToken(@){
} }
close(TOKENFILE); close(TOKENFILE);
return $Token if $Token; return $Token if $Token;
} }
return undef;
# test api status if no token could be loaded
my $param = {
url => $AuthURL,
timeout => 3,
hash => $hash,
method => "GET",
callback => \&TadoAPI_callback
};
HttpUtils_NonblockingGet($param);
return undef;
} }
sub TadoAPI_NewTokenRequest(@) { sub TadoAPI_NewTokenRequest(@) {
@ -428,6 +418,7 @@ sub TadoAPI_NewTokenRequest(@) {
Log3 $name, 5, "TadoAPI $name" . ": " . "calling NewTokenRequest()"; Log3 $name, 5, "TadoAPI $name" . ": " . "calling NewTokenRequest()";
$data = { $data = {
client_id => $client_id, client_id => $client_id,
client_secret => $client_secret, client_secret => $client_secret,