Update of /home/cvsd/slony1/slony1-engine/tools/altperl
In directory main.slony.info:/tmp/cvs-serv31041

Modified Files:
	slon_watchdog.pl 
Log Message:
Per bug #39 (reported by Peter Eisentraut)

- capture stdout/stderr in watchdog logfile

- pass on --configure value, if present


Index: slon_watchdog.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slon_watchdog.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** slon_watchdog.pl	14 Feb 2008 16:41:35 -0000	1.14
--- slon_watchdog.pl	12 Mar 2008 15:43:55 -0000	1.15
***************
*** 44,53 ****
    if (!($pid)) {
      my ($dsn, $dbname) = ($DSN[$nodenum], $DBNAME[$nodenum]);
!     open (SLONLOG, ">>$LOGDIR/slon-$dbname-$node.err");
      print SLONLOG "WATCHDOG: No Slon is running for node $node!\n";
      print SLONLOG "WATCHDOG: You ought to check the postmaster and slon for evidence of a crash!\n";
      print SLONLOG "WATCHDOG: I'm going to restart slon for $node...\n";
      # First, restart the node using slonik
!     system "@@TOOLSBIN@@/slonik_restart_node $node | @@SLONBINDIR@@/slonik";
      # Next, restart the slon process to service the node
      start_slon($nodenum);
--- 44,58 ----
    if (!($pid)) {
      my ($dsn, $dbname) = ($DSN[$nodenum], $DBNAME[$nodenum]);
!     my ($logfile) = "$LOGDIR/slon-$dbname-$node.err"
!     open (SLONLOG, ">>$logfile");
      print SLONLOG "WATCHDOG: No Slon is running for node $node!\n";
      print SLONLOG "WATCHDOG: You ought to check the postmaster and slon for evidence of a crash!\n";
      print SLONLOG "WATCHDOG: I'm going to restart slon for $node...\n";
      # First, restart the node using slonik
!     if ($CONFIG_FILE ne "") {
!       system "(@@TOOLSBIN@@/slonik_restart_node --config=${CONFIG_FILE} $node | @@SLONBINDIR@@/slonik) >> $logfile 2>> $logfile";
!     } else {
!       system "(@@TOOLSBIN@@/slonik_restart_node $node | @@SLONBINDIR@@/slonik) >> $logfile 2>> $logfile";
!     }
      # Next, restart the slon process to service the node
      start_slon($nodenum);