diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl index c3aef65e969ead249381898640bc518372c7d2c8..e95b98b4d15bcc6fb2a7b424a2b79807eb494bd4 100755 --- a/src/warden-server/bin/getClients.pl +++ b/src/warden-server/bin/getClients.pl @@ -67,7 +67,7 @@ if ($UID != 0) { # connect to DB our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr"; # obtain data from DB my $sth = $DBH->prepare("SELECT * FROM clients ORDER BY client_id ASC;") or die "Cannot prepare statement: " . $DBH->errstr; diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl index aef66c97dbb66a91e55c586ffe742bf4246efb41..400c7b53d6bd9795013cdf6584bb6d67dec7af2b 100755 --- a/src/warden-server/bin/getStatus.pl +++ b/src/warden-server/bin/getStatus.pl @@ -73,7 +73,7 @@ if ($UID != 0) { # connect to DB our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr"; #----------------------------------------------------------------------------- # Warden server variables diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl index 9144e6ee59b547cf205f0a3525bdfe4ff409d4fa..b464466c1a38313d7a991d4de787026770627346 100755 --- a/src/warden-server/bin/registerReceiver.pl +++ b/src/warden-server/bin/registerReceiver.pl @@ -131,7 +131,7 @@ my $description_tags = undef; # connect to DB our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr"; # check if receiver has been already registered or register it my $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND client_type = ? AND type = ? AND ip_net_client = ? LIMIT 1;") or die "Cannot prepare statement: " . $DBH->errstr; diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl index 7dfec8a6f0c9f993be1f8f271e7a3325d590f5f6..172695924c5b0b851728fc0f7545ed335f2de866 100755 --- a/src/warden-server/bin/registerSender.pl +++ b/src/warden-server/bin/registerSender.pl @@ -130,7 +130,7 @@ my $receive_own_events = undef; # connect to DB our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr"; # check if receiver has been already registered or register it my $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND service = ? AND client_type = ? AND ip_net_client = ? LIMIT 1;") or die "Cannot prepare statement: " . $DBH->errstr; diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl index b70cb3d2d8f591ece7d2331e4d4f974922afd824..5fb40b8e2fcbe094efe2cbd0f4f3a9485dbb0546 100755 --- a/src/warden-server/bin/unregisterClient.pl +++ b/src/warden-server/bin/unregisterClient.pl @@ -106,7 +106,7 @@ if (!defined $client_id) { # connect to DB our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr"; # check if receiver has been already registered my $sth = $DBH->prepare("SELECT client_id, hostname, service, client_type, type FROM clients WHERE client_id = ? LIMIT 1;") or die "Cannot prepare statement: " . $DBH->errstr; diff --git a/src/warden-server/lib/Warden.pm b/src/warden-server/lib/Warden.pm index acf00522728891f1b9e44c6858fa4b29ca2035a9..9e370d50a40bccb6bb6af36c434fe1196600ddce 100755 --- a/src/warden-server/lib/Warden.pm +++ b/src/warden-server/lib/Warden.pm @@ -63,7 +63,7 @@ unless (do $conf_file) { # DB CONNECT ################################################################################ our $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: $DBH->errstr"; + || die "Could not connect to database: $DBI::errstr";