diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl index 1b1f40cc52051100019fac719b8ec8dd2fc279da..e70cda03811a308778c0af19393ab33274ef1380 100755 --- a/src/warden-server/bin/getStatus.pl +++ b/src/warden-server/bin/getStatus.pl @@ -188,11 +188,12 @@ unless (defined $clients_sum_invalid) { #------------------------------------------------------------------------------- # Statistics of active registered senders -my $hash_ref; +my ($hash_ref, $clients_sum_active); unless ($clients_sum == 0) { $sth = $dbh->prepare("SELECT clients.client_id, hostname, service, count(*), min(received), max(received) FROM events LEFT JOIN clients ON events.client_id = clients.client_id WHERE clients.valid='t' AND events.valid='t' GROUP BY clients.client_id;") or die "Cannot prepare statement: " . $dbh->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr; $hash_ref = $sth->fetchall_hashref("client_id"); + $clients_sum_active = $sth->rows || "unknown"; } #------------------------------------------------------------------------------- @@ -216,37 +217,38 @@ print "\n"; print "Warden server status:\n"; print "=====================\n"; print "Database size:\t\t\t\t$db_size\n"; -print "Count of all saved events:\t\t$events_sum\n"; -print " - count of valid events:\t\t$events_sum_valid\n"; -print " - count of obsolete events:\t\t$events_sum_obsolete\n"; -print " - count of invalid events:\t\t$events_sum_invalid\n"; +print "Sum of all saved events:\t\t$events_sum\n"; +print " - sum of valid events:\t\t\t$events_sum_valid\n"; +print " - sum of obsolete events:\t\t$events_sum_obsolete\n"; +print " - sum of invalid events:\t\t$events_sum_invalid\n"; print "Last (valid) ID in events table:\t$events_last_id\n"; print "Time of first (valid) inserted event:\t$events_first_timestamp (UTC)\n"; print "Time of latest (valid) inserted event:\t$events_last_timestamp (UTC)\n"; -print "Count of all registered clients:\t$clients_sum\n"; -print " - count of valid registered clients:\t$clients_sum_valid\n"; -print " - count of invalid registered clients:\t$clients_sum_invalid\n"; +print "Sum of all registered clients:\t\t$clients_sum\n"; +print " - sum of (valid) registered clients:\t$clients_sum_valid\n"; +print " - sum of (invalid) registered clients:\t$clients_sum_invalid\n"; +print " - sum of (active) registered clients:\t$clients_sum_active\n"; print "\n"; unless ($clients_sum == 0) { print "Statistics of ACTIVE and VALID registered senders:\n"; print "==================================================\n"; - print "+---------------------------------------------------------------------------------------------------------------------------------------------+\n"; - print "| Client ID | Hostname | Service | Stored events | First insert (UTC) | Last insert (UTC) |\n"; - print "+---------------------------------------------------------------------------------------------------------------------------------------------+\n"; + print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; + print "| Client ID | Hostname | Service | Stored events | First insert (UTC) | Last insert (UTC) |\n"; + print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; foreach my $key (sort {$a<=>$b} keys %$hash_ref) { printf("| %-14s ", $hash_ref->{$key}->{client_id} || "unknown"); printf("| %-36s ", $hash_ref->{$key}->{hostname}|| "unknown"); - printf("| %-22s ", $hash_ref->{$key}->{service} || "unknown"); + printf("| %-36s ", $hash_ref->{$key}->{service} || "unknown"); printf("| %-14s ", $hash_ref->{$key}->{"count(*)"} || "unknown"); printf("| %-19s ", $hash_ref->{$key}->{"min(received)"} || "unknown"); printf("| %-19s |\n", $hash_ref->{$key}->{"max(received)"} || "unknown"); } - print "+---------------------------------------------------------------------------------------------------------------------------------------------+\n"; + print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "\n"; } -print "Current server status in:\t" . scalar localtime(time) . "\n"; +print "Current server status at:\t" . scalar localtime(time) . " (generated in " . scalar (time() - $^T) . " seconds)\n"; # cleanup section END {