Skip to content
Snippets Groups Projects
Commit de60cf41 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

rozsirena polozka valid u zprav

parent 20c135be
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/warden-server/bin/getStatus.pl
+ 51
− 47
View file @ de60cf41
...@@ -112,22 +112,40 @@ $sth->execute($WardenCommon::DB_NAME, 'events') or die "Cannot execute statement ...@@ -112,22 +112,40 @@ $sth->execute($WardenCommon::DB_NAME, 'events') or die "Cannot execute statement
my $size = $sth->fetchrow(); my $size = $sth->fetchrow();
my $db_size = defined $size ? Format::Human::Bytes::base10($size) : "none"; my $db_size = defined $size ? Format::Human::Bytes::base10($size) : "none";
# sum of records in table events
$sth = $dbh->prepare("SELECT count(*) FROM events WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr; # 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; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_sum = $sth->fetchrow(); my $events_sum = $sth->fetchrow();
if (!defined $events_sum) { if (!defined $events_sum) {
$events_sum = "none"; $events_sum = "none";
} }
# sum of records in table events (with invalid) # sum of valid records in table events
$sth = $dbh->prepare("SELECT count(*) FROM events;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT count(*) FROM events WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_sum_inv = $sth->fetchrow(); my $events_sum_valid = $sth->fetchrow();
if (!defined $events_sum_inv) { if (!defined $events_sum_valid) {
$events_sum_inv = "none"; $events_sum_valid = "none";
} }
# sum of obsolete records in table events
$sth = $dbh->prepare("SELECT count(*) FROM events WHERE valid = 'o';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_sum_obsolete = $sth->fetchrow();
if (!defined $events_sum_obsolete) {
$events_sum_obsolete = "none";
}
# sum of fail records in table events
$sth = $dbh->prepare("SELECT count(*) FROM events WHERE valid = 'f';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_sum_invalid = $sth->fetchrow();
if (!defined $events_sum_invalid) {
$events_sum_invalid = "none";
}
# id of last record in table events # 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 = $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; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -136,13 +154,6 @@ if (!defined $events_last_id) { ...@@ -136,13 +154,6 @@ if (!defined $events_last_id) {
$events_last_id = "none"; $events_last_id = "none";
} }
# id of last record in table events (with invalid)
$sth = $dbh->prepare("SELECT max(id) FROM events;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_last_id_inv = $sth->fetchrow();
if (!defined $events_last_id_inv) {
$events_last_id_inv = "none";
}
# timestamp of first record in table events # 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 = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr;
...@@ -152,14 +163,6 @@ if (!defined $events_first_timestamp) { ...@@ -152,14 +163,6 @@ if (!defined $events_first_timestamp) {
$events_first_timestamp = "none"; $events_first_timestamp = "none";
} }
# timestamp of first record in table events (with invalid)
$sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events);") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_first_timestamp_inv = $sth->fetchrow();
if (!defined $events_first_timestamp_inv) {
$events_first_timestamp_inv = "none";
}
# timestamp of last record in table events # timestamp of last record in table events
$sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT max(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT max(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -168,28 +171,29 @@ if (!defined $events_last_timestamp) { ...@@ -168,28 +171,29 @@ if (!defined $events_last_timestamp) {
$events_last_timestamp = "none"; $events_last_timestamp = "none";
} }
# timestamp of last record in table events (with invalid)
$sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT max(id) FROM events);") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $events_last_timestamp_inv = $sth->fetchrow();
if (!defined $events_last_timestamp_inv) {
$events_last_timestamp_inv = "none";
}
# sum of records in table clients # sum of all records in table clients
$sth = $dbh->prepare("SELECT count(*) FROM clients WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT count(*) FROM clients;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $clients_sum = $sth->fetchrow(); my $clients_sum = $sth->fetchrow();
if (!defined $clients_sum) { if (!defined $clients_sum) {
$clients_sum = "none"; $clients_sum = "none";
} }
# sum of records in table clients (with invalid) # sum of valid records in table clients
$sth = $dbh->prepare("SELECT count(*) FROM clients;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT count(*) FROM clients WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $clients_sum_valid = $sth->fetchrow();
if (!defined $clients_sum_valid) {
$clients_sum_valid = "none";
}
# sum of invaled records in table clients
$sth = $dbh->prepare("SELECT count(*) FROM clients WHERE valid = 'f';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $clients_sum_inv = $sth->fetchrow(); my $clients_sum_invalid = $sth->fetchrow();
if (!defined $clients_sum_inv) { if (!defined $clients_sum_invalid) {
$clients_sum_inv = "none"; $clients_sum_invalid = "none";
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
...@@ -223,17 +227,17 @@ print "\n"; ...@@ -223,17 +227,17 @@ print "\n";
print "Warden server status:\n"; print "Warden server status:\n";
print "=====================\n"; print "=====================\n";
print "Database size:\t\t\t\t\t$db_size\n"; print "Database size:\t\t\t\t$db_size\n";
print "Count of saved events:\t\t\t\t$events_sum\n"; print "Count of all saved events:\t\t$events_sum\n";
print "Count of saved events (with invalid):\t\t$events_sum_inv\n"; print " - count of valid events:\t\t$events_sum_valid\n";
print "Last ID in events table:\t\t\t$events_last_id\n"; print " - count of obsolete events:\t\t$events_sum_obsolete\n";
print "Last ID in events table (with invalid):\t\t$events_last_id_inv\n"; print " - count of invalid events:\t\t$events_sum_invalid\n";
print "Time of first inserted event:\t\t\t$events_first_timestamp (UTC)\n"; print "Last (valid) ID in events table:\t$events_last_id\n";
print "Time of first inserted event (with invalid):\t$events_first_timestamp_inv (UTC)\n"; print "Time of first (valid) inserted event:\t$events_first_timestamp (UTC)\n";
print "Time of latest inserted event:\t\t\t$events_last_timestamp (UTC)\n"; print "Time of latest (valid) inserted event:\t$events_last_timestamp (UTC)\n";
print "Time of latest inserted event (with invalid):\t$events_last_timestamp_inv (UTC)\n"; print "Count of all registered clients:\t$clients_sum\n";
print "Count of registered clients:\t\t\t$clients_sum\n"; print " - count of valid registered clients:\t$clients_sum_valid\n";
print "Count of registered clients (with invalid):\t$clients_sum_inv\n"; print " - count of invalid registered clients:\t$clients_sum_invalid\n";
print "\n"; print "\n";
if ($clients_sum != 0) { if ($clients_sum != 0) {
......
src/warden-server/bin/unregisterClient.pl
+ 2
− 2
View file @ de60cf41
...@@ -108,7 +108,7 @@ my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST ...@@ -108,7 +108,7 @@ my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST
my $warden_server = WardenCommon::trim(`hostname -f`); my $warden_server = WardenCommon::trim(`hostname -f`);
# check if receiver has been already registered # check if client has been already registered
my $sth = $dbh->prepare("SELECT client_id, hostname, service, client_type, type FROM clients WHERE client_id = ? AND valid = 't' LIMIT 1;") or die "Cannot prepare statement: " . $dbh->errstr; my $sth = $dbh->prepare("SELECT client_id, hostname, service, client_type, type FROM clients WHERE client_id = ? AND valid = 't' LIMIT 1;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr; $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr;
my ($id, $hostname, $service, $client_type, $type) = $sth->fetchrow(); my ($id, $hostname, $service, $client_type, $type) = $sth->fetchrow();
...@@ -122,7 +122,7 @@ if (!defined $id) { ...@@ -122,7 +122,7 @@ if (!defined $id) {
$sth = $dbh->prepare("UPDATE clients SET valid = 'f' WHERE client_id = ?;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("UPDATE clients SET valid = 'f' WHERE client_id = ?;") or die "Cannot prepare statement: " . $dbh->errstr;
my $ret_val = $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr; my $ret_val = $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr;
if ($ret_val == 1) { if ($ret_val == 1) {
$sth = $dbh->prepare("UPDATE events SET valid = 'f' where hostname = ? AND service = ?;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("UPDATE events SET valid = 'o' where hostname = ? AND service = ?;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute($hostname, $service) or die "Cannot execute statement: " . $sth->errstr; $sth->execute($hostname, $service) or die "Cannot execute statement: " . $sth->errstr;
# log message until after invalidate all events # log message until after invalidate all events
sendMsg("info", "Sender [Client_id: '$client_id', Hostname: '$hostname', Service: '$service'] has been deleted and its data were invalidated from Warden server '$warden_server'"); sendMsg("info", "Sender [Client_id: '$client_id', Hostname: '$hostname', Service: '$service'] has been deleted and its data were invalidated from Warden server '$warden_server'");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment