From 7c8edfb5611a273e7572fe850bd68e124d3350d2 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Fri, 8 Feb 2013 15:09:53 +0100
Subject: [PATCH] zmena volani chyboveho vypisu DB na DBI
---
src/warden-server/bin/getClients.pl | 2 +-
src/warden-server/bin/getStatus.pl | 2 +-
src/warden-server/bin/registerReceiver.pl | 2 +-
src/warden-server/bin/registerSender.pl | 2 +-
src/warden-server/bin/unregisterClient.pl | 2 +-
src/warden-server/lib/Warden.pm | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl
index c3aef65..e95b98b 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 aef66c9..400c7b5 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 9144e6e..b464466 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 7dfec8a..1726959 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 b70cb3d..5fb40b8 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 acf0052..9e370d5 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";
--
GitLab