Log Message:
-----------
Bug #1590 - fixing up parameter handling, interpreter name

Added to docs indication that you can use PG environment vars as defaults

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine/tools:
        test_slony_state-dbi.pl (r1.3 -> r1.3.2.1)
        test_slony_state.pl (r1.5 -> r1.5.2.1)
    slony1-engine/doc/adminguide:
        monitoring.sgml (r1.29.2.4 -> r1.29.2.5)

-------------- next part --------------
Index: test_slony_state-dbi.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/test_slony_state-dbi.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -Ltools/test_slony_state-dbi.pl -Ltools/test_slony_state-dbi.pl -u -w -r1.3 -r1.3.2.1
--- tools/test_slony_state-dbi.pl
+++ tools/test_slony_state-dbi.pl
@@ -1,4 +1,4 @@
-#!perl   # -*- perl -*-
+#!/usr/bin/perl   # -*- perl -*-
 # $Id$
 # Christopher Browne
 # Copyright 2005
@@ -15,27 +15,28 @@
 
 my $sleep_seconds = 4;
 
-my $goodopts = GetOptions("help", "database=s", "host=s", "user=s", "cluster=s",
-			  "password=s", "port=s", "recipient=s", "mailprog=s");
-if (defined($opt_help)) {
+GetOptions
+ ("H|help" => \$help,
+  "d|database=s" => \$database,
+  "h|host=s" => \$host,
+  "u|user=s" => \$user,
+  "c|cluster=s" => \$cluster,
+  "p|password=s" => \$password,
+  "P|port=i" => \$port,
+  "m|mailprog=s" => \$mailprog,
+  "f|finalquery=s" => \$finalquery,
+  "r|recipient=s" => \$recipient);
+
+if (defined($help)) {
   show_usage();
 }
-my ($database,$user, $port, $cluster, $host, $password, $set, $finalquery);
-
-$database = $opt_database if (defined($opt_database));
-$port = 5432;
-$port = $opt_port if (defined($opt_port));
-$user = `uname`;  chomp $user;
-$user = $opt_user if (defined($opt_user));
-$password = $opt_password if (defined($opt_password));
-$host = "localhost";
-$host = $opt_host if (defined($opt_host));
-$cluster = $opt_cluster if (defined($opt_cluster));
-$recipient = $opt_recipient if (defined($opt_recipient));
-$mailprog = $opt_mailprog if (defined($opt_mailprog));
+my $initialDSN = "dbi:Pg:";
 
-my $initialDSN = "dbi:Pg:dbname=$database;host=$host;port=$port;user=$user";
-$initialDSN = $initialDSN . ";password=$password" if defined($opt_password);
+$initialDSN .= "dbname=$database;" if (defined $database);
+$initialDSN .= "host=$host;" if (defined $host);
+$initialDSN .= "port=$port;" if (defined $port);
+$initialDSN .= "user=$user;" if (defined $user);
+$initialDSN .= "password=$password;" if (defined $password);
 
 print "DSN: $initialDSN\n===========================\n";
 
@@ -294,7 +295,7 @@
     chomp $inerr;
     print $inerr, "\n";
   }
-  die "$0  --host --database --user --cluster --port=integer --password --recipient --mailprog";
+  die "$0  --host --database --user --cluster --port=integer --password --recipient --mailprog\nnote also that libpq environment variables PGDATABASE, PGPORT, ... may also be passed in";
 }
 
 sub add_problem {
Index: test_slony_state.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/test_slony_state.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -Ltools/test_slony_state.pl -Ltools/test_slony_state.pl -u -w -r1.5 -r1.5.2.1
--- tools/test_slony_state.pl
+++ tools/test_slony_state.pl
@@ -1,4 +1,4 @@
-#!perl   # -*- perl -*-
+#!/usr/bin/perl   # -*- perl -*-
 # $Id$
 # Christopher Browne
 # Copyright 2005
@@ -15,28 +15,27 @@
 
 my $sleep_seconds = 4;
 
-my $goodopts = GetOptions("help", "database=s", "host=s", "user=s", "cluster=s",
-			  "password=s", "port=s", "recipient=s", "mailprog=s");
-if (defined($opt_help)) {
+GetOptions
+ ("H|help" => \$help,
+  "d|database=s" => \$database,
+  "h|host=s" => \$host,
+  "u|user=s" => \$user,
+  "c|cluster=s" => \$cluster,
+  "p|password=s" => \$password,
+  "P|port=i" => \$port,
+  "m|mailprog=s" => \$mailprog,
+  "f|finalquery=s" => \$finalquery,
+  "r|recipient=s" => \$recipient);
+
+if (defined($help)) {
   show_usage();
 }
-my ($database,$user, $port, $cluster, $host, $password, $set, $finalquery);
-
-$database = $opt_database if (defined($opt_database));
-$port = 5432;
-$port = $opt_port if (defined($opt_port));
-$user = `uname`;  chomp $user;
-$user = $opt_user if (defined($opt_user));
-$password = $opt_password if (defined($opt_password));
-$host = "localhost";
-$host = $opt_host if (defined($opt_host));
-$cluster = $opt_cluster if (defined($opt_cluster));
-$recipient = $opt_recipient if (defined($opt_recipient));
-$mailprog = $opt_mailprog if (defined($opt_mailprog));
-
-#DBI: my $initialDSN = "dbi:Pg:dbname=$database;host=$host;port=$port";
-my $initialDSN = "dbname=$database host=$host port=$port user=$user";
-$initialDSN = $initialDSN . " password=$password" if defined($opt_password);
+my $initialDSN = "";
+$initialDSN .= "dbname=$database " if (defined $database);
+$initialDSN .= "host=$host " if (defined $host);
+$initialDSN .= "port=$port " if (defined $port);
+$initialDSN .= "user=$user " if (defined $user);
+$initialDSN .= "password=$password " if (defined $password);
 
 print "DSN: $initialDSN\n===========================\n";
 
@@ -286,7 +285,7 @@
     chomp $inerr;
     print $inerr, "\n";
   }
-  die "$0  --host --database --user --cluster --port=integer --password --recipient --mailprog";
+  die "$0  --host --database --user --cluster --port=integer --password --recipient --mailprog\nnote also that libpq environment variables PGDATABASE, PGPORT, ... may also be passed in";
 }
 
 sub add_problem {
Index: monitoring.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/monitoring.sgml,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -Ldoc/adminguide/monitoring.sgml -Ldoc/adminguide/monitoring.sgml -u -w -r1.29.2.4 -r1.29.2.5
--- doc/adminguide/monitoring.sgml
+++ doc/adminguide/monitoring.sgml
@@ -111,6 +111,12 @@
 a program equivalent to <productname>Unix</productname>
 <application>mailx</application>) and a recipient of email. </para>
 
+<para> You may alternatively specify database connection parameters
+via the environment variables used by
+<application>libpq</application>, <emphasis>e.g.</emphasis> - using
+<envar>PGPORT</envar>, <envar>PGDATABASE</envar>,
+<envar>PGUSER</envar>, <envar>PGSERVICE</envar>, and such.</para>
+
 <para> The script then rummages through <xref linkend="table.sl-path">
 to find all of the nodes in the cluster, and the DSNs to allow it to,
 in turn, connect to each of them.</para>