summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Sabino Mullane2011-02-12 18:09:15 +0000
committerGreg Sabino Mullane2011-02-12 18:09:15 +0000
commit3afb56973693201d9f766134898b22a72e1f0df6 (patch)
treecf1db35f3e957fdbe0e0c5354773621370993e91
parentf0b76538649f2767067da63119411a276d5d3e71 (diff)
Clean up translations and tests.
-rwxr-xr-xcheck_postgres.pl38
-rw-r--r--t/02_txn_idle.t2
-rw-r--r--t/03_translations.t6
3 files changed, 41 insertions, 5 deletions
diff --git a/check_postgres.pl b/check_postgres.pl
index dfa813538..57a6f9155 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -185,6 +185,11 @@ our %msg = (
'psa-disabled' => q{No queries - is stats_command_string or track_activities off?},
'psa-noexact' => q{Unknown error},
'psa-nosuper' => q{No matches - please run as a superuser},
+ 'qtime-count-msg' => q{Total queries: $1},
+ 'qtime-count-none' => q{not more than $1 queries},
+ 'qtime-for-msg' => q{$1 queries longer than $2s, longest: $3s$4 $5},
+ 'qtime-msg' => q{longest query: $1s$2 $3},
+ 'qtime-none' => q{no queries},
'queries' => q{queries},
'query-time' => q{query_time},
'range-badcs' => q{Invalid '$1' option: must be a checksum},
@@ -282,12 +287,21 @@ our %msg = (
'transactions' => q{transactions},
'trigger-msg' => q{Disabled triggers: $1},
'txn-time' => q{transaction_time},
+ 'txnidle-count-msg' => q{Total idle in transaction: $1},
+ 'txnidle-count-none' => q{not more than $1 idle in transaction},
+ 'txnidle-for-msg' => q{$1 idle transactions longer than $2s, longest: $3s$4 $5},
+ 'txnidle-msg' => q{longest idle in txn: $1s$2 $3},
+ 'txnidle-none' => q{no idle in transaction},
+ 'txntime-count-msg' => q{Total transactions: $1},
+ 'txntime-count-none' => q{not more than $1 transactions},
+ 'txntime-for-msg' => q{$1 transactions longer than $2s, longest: $3s$4 $5},
+ 'txntime-msg' => q{longest txn: $1s$2 $3},
+ 'txntime-none' => q{No transactions},
'txnwrap-cbig' => q{The 'critical' value must be less than 2 billion},
'txnwrap-wbig' => q{The 'warning' value must be less than 2 billion},
'unknown-error' => q{Unknown error},
'usage' => qq{\nUsage: \$1 <options>\n Try "\$1 --help" for a complete list of options\n Try "\$1 --man" for the full manual\n},
'username' => q{username},
- 'vac-msg' => q{DB: $1 TABLE: $2},
'vac-nomatch-a' => q{No matching tables have ever been analyzed},
'vac-nomatch-v' => q{No matching tables have ever been vacuumed},
'version' => q{version $1},
@@ -395,6 +409,11 @@ our %msg = (
'psa-disabled' => q{Pas de requ??te - est-ce que stats_command_string ou track_activities sont d??sactiv??s ?},
'psa-noexact' => q{Erreur inconnue},
'psa-nosuper' => q{Aucune correspondance - merci de m'ex??cuter en tant que superutilisateur},
+'qtime-count-msg' => q{Total queries: $1},
+'qtime-count-none' => q{not more than $1 queries},
+'qtime-for-msg' => q{$1 queries longer than $2s, longest: $3s$4 $5},
+ 'qtime-msg' => q{requête la plus longue : $1s$2 $3},
+'qtime-none' => q{no queries},
'queries' => q{queries},
'query-time' => q{query_time},
'range-badcs' => q{Option « $1 » invalide : doit être une somme de contrôle},
@@ -492,12 +511,21 @@ our %msg = (
'transactions' => q{transactions},
'trigger-msg' => q{Triggers désactivés : $1},
'txn-time' => q{transaction_time},
+'txnidle-count-msg' => q{Total idle in transaction: $1},
+ 'txnidle-count-none' => q{pas plus de $1 transaction en attente},
+'txnidle-for-msg' => q{$1 idle transactions longer than $2s, longest: $3s$4 $5},
+ 'txnidle-msg' => q{transaction en attente la plus longue : $1s$2 $3},
+ 'txnidle-none' => q{Aucun processus en attente dans une transaction},
+'txntime-count-msg' => q{Total transactions: $1},
+'txntime-count-none' => q{not more than $1 transactions},
+'txntime-for-msg' => q{$1 transactions longer than $2s, longest: $3s$4 $5},
+ 'txntime-msg' => q{Transaction la plus longue : $1s$2 $3},
+ 'txntime-none' => q{Aucune transaction},
'txnwrap-cbig' => q{La valeur critique doit être inférieure à 2 milliards},
'txnwrap-wbig' => q{La valeur d'avertissement doit être inférieure à 2 milliards},
'unknown-error' => q{erreur inconnue},
'usage' => qq{\nUsage: \$1 <options>\n Essayez « \$1 --help » pour liste complète des options\n\n},
'username' => q{nom utilisateur},
- 'vac-msg' => q{Base de données : $1 Table : $2},
'vac-nomatch-a' => q{Aucune des tables correspondantes n'a eu d'opération ANALYZE},
'vac-nomatch-v' => q{Aucune des tables correspondantes n'a eu d'opération VACUUM},
'version' => q{version $1},
@@ -4096,7 +4124,11 @@ FROM (SELECT nspname, relname, $criteria AS v
return;
}
if ($maxtime == -2) {
- add_unknown msg($found ? $type eq 'vacuum' ? 'vac-nomatch-v' : 'vac-nomatch-a' : 'no-match-table');
+ add_unknown (
+ $found ? $type eq 'vacuum' ? msg('vac-nomatch-v')
+ : msg('vac-nomatch-a')
+ : msg('no-match-table')
+ );
}
elsif ($maxtime < 0) {
add_unknown $type eq 'vacuum' ? msg('vac-nomatch-v') : msg('vac-nomatch-a');
diff --git a/t/02_txn_idle.t b/t/02_txn_idle.t
index ab7391652..f5a32a89c 100644
--- a/t/02_txn_idle.t
+++ b/t/02_txn_idle.t
@@ -6,7 +6,7 @@ use 5.006;
use strict;
use warnings;
use Data::Dumper;
-use Test::More tests => 15;
+use Test::More tests => 14;
use lib 't','.';
use CP_Testing;
diff --git a/t/03_translations.t b/t/03_translations.t
index 0caef6627..36a9cbd57 100644
--- a/t/03_translations.t
+++ b/t/03_translations.t
@@ -102,7 +102,11 @@ for my $call (sort keys %call) {
$ok and pass $t;
my %ok2notuse = map { $_ => 1 }
- qw/time-week time-weeks time-month time-months time-year time-years/;
+ qw/time-week time-weeks time-month time-months time-year time-years
+qtime-count-msg qtime-count-none qtime-for-msg qtime-msg qtime-none
+txntime-count-msg txntime-count-none txntime-for-msg txntime-msg txntime-none
+txnidle-count-msg txnidle-count-none txnidle-for-msg txnidle-msg txnidle-none
+/;
my %ok2nottrans;
for my $msg (qw/timesync-diff time-minute time-minutes maxtime version version-ok/) {