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

fixed initialization error of undef var

This commit is contained in:
Philipp Wo 2019-10-26 09:39:06 +02:00
parent 0b54ae4e83
commit 9fed48fb7f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
98_TadoAPI.pm
View File

@ -158,10 +158,10 @@ sub TadoAPI_Set(@) {
if( $cmd eq 'setGeo' ) {
if( $value eq "on" ) {
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)\n";
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)";
TadoAPI_SetGeo($hash, 1);
} else {
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)\n";
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)";
TadoAPI_SetGeo($hash, 0);
}
TadoAPI_GetGeo($hash);
@ -169,7 +169,7 @@ sub TadoAPI_Set(@) {
return undef;
} elsif( $cmd eq 'refreshToken' ) {
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)\n";
Log3 $name, 3, "TadoAPI: set $name: processing ($cmd)";
RemoveInternalTimer($hash);
InternalTimer( gettimeofday() + 10, "TadoAPI_Update", $hash, 0 );
TadoAPI_Connect($hash);
@ -378,10 +378,9 @@ sub TadoAPI_Connect(@) {
my ($hash) = @_;
my $name = $hash->{NAME};
my $tokenFileName = $tokenFile."_".$name;
my $tokenLifeTime = $hash->{TOKEN_LIFETIME};
$tokenLifeTime = localtime($tokenLifeTime);
my $tokenLifeTime = 0 unless $hash->{TOKEN_LIFETIME};
#debug
$debug = $attr{$name}{debug};
@ -395,14 +394,14 @@ sub TadoAPI_Connect(@) {
open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!");
$TokenData = decode_json(<TOKENFILE>)};
if($@ || $hash->{TOKEN_LIFETIME} < gettimeofday()){
if($@ || $tokenLifeTime < gettimeofday()){
Log3 $name, 3, "TadoAPI $name" . ": " . "Error while loading: $@" if $debug && $@;
Log3 $name, 3, "TadoAPI $name" . ": " . "Token expired, requesting new one" if $debug && $hash->{TOKEN_LIFETIME} < gettimeofday();
Log3 $name, 3, "TadoAPI $name" . ": " . "Token expired, requesting new one" if $debug && $tokenLifeTime < gettimeofday();
TadoAPI_requestNewToken($hash);
}else{
Log3 $name, 3, "TadoAPI $name" . ": " . "Token expires at " . $tokenLifeTime if $debug;
Log3 $name, 3, "TadoAPI $name" . ": " . "Token expires at " . localtime($tokenLifeTime) if $debug;
# if token is about to expire, refresh him
if (($hash->{TOKEN_LIFETIME}-60) < gettimeofday()){
if (($tokenLifeTime-60) < gettimeofday()){
Log3 $name, 3, "TadoAPI $name" . ": " . "Token will expire soon, refreshing" if $debug;
TadoAPI_refreshToken($hash);
}