diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl index c7659aab41dd4e83bf9ff12e0a6eca8a8e2ce76e..4760c4cf271201c3ffdbe71f0d79fabd4e8861e7 100755 --- a/src/warden-server/bin/getStatus.pl +++ b/src/warden-server/bin/getStatus.pl @@ -80,7 +80,7 @@ my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST #----------------------------------------------------------------------------- # Warden server variables -my $package_version = WardenCommon::trim(`cat /opt/warden-server/etc/package_version`); +my $package_version = WardenCommon::trim(`cat $etc/package_version`); my $version = substr($package_version, 14); my $hostname = WardenCommon::trim(`hostname -f`); my $ip_address = WardenCommon::trim(`hostname -i`); @@ -105,7 +105,6 @@ $sth->execute($WardenCommon::DB_NAME, 'events') or die "Cannot execute statement my $size = $sth->fetchrow(); my $db_size = defined $size ? Format::Human::Bytes::base10($size) : "none"; - # sum of all records in table events $sth = $dbh->prepare("SELECT count(*) FROM events;") or die "Cannot prepare statement: " . $dbh->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr; @@ -138,7 +137,6 @@ if (!defined $events_sum_invalid) { $events_sum_invalid = "none"; } - # id of last record in table events $sth = $dbh->prepare("SELECT max(id) FROM events WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr; @@ -147,7 +145,6 @@ if (!defined $events_last_id) { $events_last_id = "none"; } - # timestamp of first record in table events $sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr; @@ -164,7 +161,6 @@ if (!defined $events_last_timestamp) { $events_last_timestamp = "none"; } - # sum of all records in table clients $sth = $dbh->prepare("SELECT count(*) FROM clients;") or die "Cannot prepare statement: " . $dbh->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr; @@ -193,9 +189,7 @@ if (!defined $clients_sum_invalid) { # Statistics of active registered senders my $hash_ref; if ($clients_sum != 0) { -# $sth = $dbh->prepare("SELECT clients.client_id, clients.hostname, clients.service, count(*), max(received) FROM events LEFT JOIN clients ON (events.hostname=clients.hostname AND events.service=clients.service) WHERE clients.valid='t' AND events.valid='t' GROUP BY client_id;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT clients.client_id, clients.hostname, clients.service, count(*), max(received) FROM events LEFT JOIN clients ON (events.client_id=clients.client_id) WHERE clients.valid='t' AND events.valid='t' GROUP BY client_id;") or die "Cannot prepare statement: " . $dbh->errstr; - $sth->execute or die "Cannot execute statement: " . $sth->errstr; my ($client_id, $hostname, $service, $count, $timestamp, $client_status); $hash_ref = $sth->fetchall_hashref("client_id");