From d9bfbd003895f2a115146615af0396d4b4a1fb32 Mon Sep 17 00:00:00 2001 From: Philipp Wo Date: Mon, 20 Apr 2020 00:17:52 +0200 Subject: [PATCH] perlcritic -3; file handling now pbp --- 98_TadoAPI.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/98_TadoAPI.pm b/98_TadoAPI.pm index 9ea8783..1fd0dee 100644 --- a/98_TadoAPI.pm +++ b/98_TadoAPI.pm @@ -420,9 +420,9 @@ sub TadoAPI_LoadToken(@){ my $Token = undef; if($apiStatus){ - open(my $TOKENFILE, '<', $tokenFileName) or die("ERROR: $!"); + open(my $TOKENFILE, q{<}, $tokenFileName) or croak("ERROR: $!"); + eval { $Token = decode_json(<$TOKENFILE>)}; close($TOKENFILE); - eval { $Token = decode_json($TOKENFILE)}; if($@ || $tokenLifeTime < gettimeofday()){ Log3 $name, 5, "TadoAPI $name" . ": " . "Error while loading: $@ ,requesting new one" if $@; @@ -485,7 +485,7 @@ sub TadoAPI_NewTokenRequest(@) { Log3 $name, 3, "TadoAPI $name" . ": " . "NewTokenRequest: decode_json failed, invalid json. error: $@ "; }else{ #write token data in file - open(my $TOKENFILE, q{>} ,$tokenFileName) or die("ERROR: $!"); + open(my $TOKENFILE, q{>} ,$tokenFileName) or croak("ERROR: $!"); print $TOKENFILE $returnData . "\n"; close($TOKENFILE); @@ -507,9 +507,9 @@ sub TadoAPI_TokenRefresh(@) { my $Token = undef; # load token - open(my $TOKENFILE, '<', $tokenFileName) or die("ERROR: $!"); + open(my $TOKENFILE, q{<}, $tokenFileName) or croak("ERROR: $!"); + eval { $Token = decode_json(<$TOKENFILE>)}; close($TOKENFILE); - eval { $Token = decode_json($TOKENFILE)}; $data = { client_id => $client_id, @@ -547,7 +547,7 @@ sub TadoAPI_TokenRefresh(@) { $hash->{STATE}="error"; }else{ #write token data in file - open(my $TOKENFILE, q{>}, $tokenFileName) or die("ERROR: $!"); + open(my $TOKENFILE, q{>}, $tokenFileName) or croak("ERROR: $!"); print $TOKENFILE $returnData . "\n"; close($TOKENFILE);