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

errorhandling croak instead of die

This commit is contained in:
Philipp Wo 2020-04-25 10:38:05 +02:00
parent cb245489be
commit 99ff30c13a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
98_TadoAPI.pm
View File

@ -29,6 +29,7 @@ use HTTP::Request::Common qw (POST GET PUT);
use HTTP::Headers; use HTTP::Headers;
use JSON; use JSON;
use POSIX qw(strftime); use POSIX qw(strftime);
use Carp;
####DEFAULTS############ ####DEFAULTS############
my $client_id = 'public-api-preview'; my $client_id = 'public-api-preview';
@ -468,7 +469,7 @@ sub TadoAPI_LoadToken {
if ($apiStatus) { if ($apiStatus) {
my $TOKENFILE; my $TOKENFILE;
eval{ eval{
open( $TOKENFILE, q{<}, $tokenFileName ) or die("ERROR: $!"); open( $TOKENFILE, q{<}, $tokenFileName ) or croak( "Tokenfile loading error: $! " );
$Token = decode_json(<$TOKENFILE>) }; $Token = decode_json(<$TOKENFILE>) };
close($TOKENFILE); close($TOKENFILE);
@ -548,7 +549,7 @@ sub TadoAPI_NewTokenRequest {
} }
else { else {
#write token data in file #write token data in file
open( my $TOKENFILE, q{>}, $tokenFileName ) or die("ERROR: $!"); open( my $TOKENFILE, q{>}, $tokenFileName ) or croak( "Tokenfile writing error: $! " );
print $TOKENFILE $returnData . "\n"; print $TOKENFILE $returnData . "\n";
close($TOKENFILE); close($TOKENFILE);
@ -577,7 +578,7 @@ sub TadoAPI_TokenRefresh {
# load token # load token
my $TOKENFILE; my $TOKENFILE;
eval { eval {
open( $TOKENFILE, q{<}, $tokenFileName ) or die("ERROR: $!"); open( $TOKENFILE, q{<}, $tokenFileName ) or croak( "Tokenfile loading for refresh error: $! " );
$Token = decode_json(<$TOKENFILE>) }; $Token = decode_json(<$TOKENFILE>) };
close($TOKENFILE); close($TOKENFILE);
@ -623,7 +624,7 @@ sub TadoAPI_TokenRefresh {
} }
else { else {
#write token data in file #write token data in file
open( my $TOKENFILE, q{>}, $tokenFileName ) or die("ERROR: $!"); open( my $TOKENFILE, q{>}, $tokenFileName ) or croak( "Tokenfile refreshing (write) error: $! " );
print $TOKENFILE $returnData . "\n"; print $TOKENFILE $returnData . "\n";
close($TOKENFILE); close($TOKENFILE);
@ -1763,7 +1764,7 @@ sub TadoAPI_storePassword {
my $key = getUniqueId() . $index; my $key = getUniqueId() . $index;
my $e_pwd = ""; my $e_pwd = "";
if ( eval { use Digest::MD5; 1 } ) { if ( eval { require Digest::MD5; 1 } ) {
$key = Digest::MD5::md5_hex( unpack "H*", $key ); $key = Digest::MD5::md5_hex( unpack "H*", $key );
$key .= Digest::MD5::md5_hex($key); $key .= Digest::MD5::md5_hex($key);
} }
@ -1798,7 +1799,7 @@ sub TadoAPI_readPassword {
} }
if ( defined($password) ) { if ( defined($password) ) {
if ( eval { use Digest::MD5; 1 } ) { if ( eval { require Digest::MD5; 1 } ) {
$key = Digest::MD5::md5_hex( unpack "H*", $key ); $key = Digest::MD5::md5_hex( unpack "H*", $key );
$key .= Digest::MD5::md5_hex($key); $key .= Digest::MD5::md5_hex($key);
} }