Upraveno cteni konfiguracnich souboru - odchyceny navraty 'do', zruseno...

Upraveno cteni konfiguracnich souboru - odchyceny navraty 'do', zruseno nadbytecne kontrolni cteni (#533)

src/warden-client/lib/WardenClientConf.pm

@@ -26,15 +26,11 @@ sub loadConf
   our $SSL_CA_FILE = undef;
   our $MAX_RCV_EVENTS_LIMIT = undef;
 
-  # read config file
-  if ( ! open( TMP, $conf_file) ) {
-    die("Can't read config file '$conf_file': $!\n");
-  }
-  close TMP;
-
   # load set variables by user
-  if ( !do $conf_file ) {
-    die("Errors in config file '$conf_file': $@");
+  unless (do $conf_file) {
+    die("Errors in config file '$conf_file': $@") if $@;
+    die("Can't read config file '$conf_file': $!") unless defined $_;
+    # if $_ defined, it's retvalue of last statement of conf, for which we don't care
   }
 
   return ($URI, $SSL_KEY_FILE, $SSL_CERT_FILE, $SSL_CA_FILE, $MAX_RCV_EVENTS_LIMIT);

src/warden-server/lib/Warden.pm

@@ -36,15 +36,11 @@ our $DB_HOST	= undef;
 our $MAX_EVENTS_LIMIT	= undef;
 our %VALID_STRINGS	= undef;
 
-# read config file
-if (!open( TMP, $conf_file)) {
-  errMsg("Can't read config file '$conf_file': $!\n");
-}
-close TMP;
-
 # load set variables by user
-if (!do $conf_file) {
-  errMsg("Errors in config file '$conf_file': $@");
+unless (do $conf_file) {
+  errMsg("Errors in config file '$conf_file': $@") if $@;
+  errMsg("Can't read config file '$conf_file': $!") unless defined $_;
+  # if $_ defined, it's retvalue of last statement of conf, for which we don't care
 }
 
 

src/warden-server/lib/WardenConf.pm

@@ -25,15 +25,11 @@ sub loadConf
   our $SSL_CERT_FILE 	= undef;
   our $SSL_CA_FILE 	= undef;
 
-  # read config file
-  if ( ! open( TMP, $conf_file) ) {
-    die "Can't read config file '$conf_file': $!\n";
-  }
-  close TMP;
-
   # load set variables by user
-  if ( !do $conf_file ) {
-    die("Errors in config file '$conf_file': $@");
+  unless (do $conf_file) {
+    die("Errors in config file '$conf_file': $@") if $@;
+    die("Can't read config file '$conf_file': $!") unless defined $_;
+    # if $_ defined, it's retvalue of last statement of conf, for which we don't care
   }
 
   return ($URI, $SSL_KEY_FILE, $SSL_CERT_FILE, $SSL_CA_FILE);