odstraneny lokalni connectDB wrappery; pouziti primarni funkce WardenCommon::connectDB

src/warden-server/bin/getClients.pl

@@ -74,7 +74,7 @@ if ($script_version) {
 }
 
 # connect to DB
-my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
+my $dbh = WardenCommon::connectDB;
 
 # obtain data from DB
 my $sth = $dbh->prepare("SELECT * FROM clients ORDER BY client_id ASC;") or die "Cannot prepare statement: " . $dbh->errstr;

src/warden-server/bin/getStatus.pl

@@ -76,7 +76,7 @@ if ($script_version) {
 }
 
 # connect to DB
-my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
+my $dbh = WardenCommon::connectDB;
 
 #-----------------------------------------------------------------------------
 # Warden server variables

src/warden-server/bin/registerReceiver.pl

@@ -131,7 +131,7 @@ my $description_tags	= undef;
 my $warden_server = WardenCommon::trim(`hostname -f`);
 
 # connect to DB
-my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
+my $dbh = WardenCommon::connectDB;
 
 # register receiver
 my ($sth, $client_id_db, $hostname_db, $registered_db, $requestor_db, $client_type_db, $type_db, $receive_own_events_db, $ip_net_client_db, $valid_db);

src/warden-server/bin/registerSender.pl

@@ -123,7 +123,7 @@ my $receive_own_events	= undef;
 my $warden_server = WardenCommon::trim(`hostname -f`);
 
 # connect to DB
-my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
+my $dbh = WardenCommon::connectDB;
 
 # register sender
 my ($sth, $client_id_db, $hostname_db, $registered_db, $requestor_db, $service_db, $client_type_db, $description_tags_db, $ip_net_client_db, $valid_db);

src/warden-server/bin/unregisterClient.pl

@@ -91,7 +91,7 @@ if ($client_id !~ /^\d+\z/) {
 }
 
 # connect to DB
-my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST, $WardenCommon::DB_USER, $WardenCommon::DB_PASS);
+my $dbh = WardenCommon::connectDB;
 
 # obtain a server hostname
 my $warden_server = WardenCommon::trim(`hostname -f`);

src/warden-server/lib/Warden.pm

@@ -48,8 +48,7 @@ WardenCommon::loadConf($conf_file);
 #				DB CONNECT
 ################################################################################
 # create database handler
-our $DBH = DBI->connect("DBI:mysql:database=$WardenCommon::DB_NAME;host=$WardenCommon::DB_HOST", $WardenCommon::DB_USER, $WardenCommon::DB_PASS, {RaiseError => 1, mysql_auto_reconnect => 1})
-           || die "Could not connect to database '$WardenCommon::DB_NAME' at '$WardenCommon::DB_HOST': $DBI::errstr";
+our $DBH = WardenCommon::connectDB;
 
 
 

src/warden-server/lib/WardenCommon.pm

@@ -106,12 +106,7 @@ sub loadConf
 #-------------------------------------------------------------------------------
 sub connectDB
 {
-  my $db_name = shift;
-  my $db_host = shift;
-  my $db_user = shift;
-  my $db_pass = shift;
-
-  my $dbh = DBI->connect("DBI:mysql:database=$db_name;host=$db_host",$db_user, $db_pass, {RaiseError => 1, mysql_auto_reconnect => 1}) || die "Could not connect to database '$db_name' at '$db_host': $DBI::errstr";
+  my $dbh = DBI->connect("DBI:mysql:database=$WardenCommon::DB_NAME;host=$WardenCommon::DB_HOST",$WardenCommon::DB_USER, $WardenCommon::DB_PASS, {RaiseError => 1, mysql_auto_reconnect => 1}) || die "Could not connect to database '$WardenCommon::DB_NAME' at '$WardenCommon::DB_HOST': $DBI::errstr";
   return $dbh;
 } # End of connectDB