Log Message:
-----------
Mods per Steve Simms...

 I also moved the "require $SLON_ENV_FILE" to a point *after*
 the usage statement, so that it doesn't croak if slon.env isn't
 present.

Modified Files:
--------------
    slony1-engine/tools/altperl:
        slon_kill.pl (r1.5 -> r1.6)

-------------- next part --------------
Index: slon_kill.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_kill.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/slon_kill.pl -Ltools/altperl/slon_kill.pl -u -w -r1.5 -r1.6
--- tools/altperl/slon_kill.pl
+++ tools/altperl/slon_kill.pl
@@ -9,8 +9,9 @@
 $SLON_ENV_FILE = 'slon.env'; # Where to find the slon.env file
 $SHOW_USAGE    = 0;          # Show usage, then quit
 
-require 'slon-tools.pm';
-require $SLON_ENV_FILE;
+# Read command-line options
+GetOptions("config=s"  => \$SLON_ENV_FILE,
+	   "help"      => \$SHOW_USAGE);
 
 my $USAGE =
 "Usage: slon_kill.pl [--config file]
@@ -25,6 +26,9 @@
   exit 0;
 }
 
+require 'slon-tools.pm';
+require $SLON_ENV_FILE;
+
 print "slon_kill.pl...   Killing all slon and slon_watchdog instances for setname $SETNAME\n";
 print "1.  Kill slon watchdogs\n";
 # kill the watchdog