CVS User Account cvsuser
Tue Feb 22 20:34:50 PST 2005
Log Message:
-----------
Fixed the restart_node call in slon_watchdog.pl.

Required adding a pgbindir subsitution to the Makefile, so that the
restart_node command can be run instead of just printed.

Modified Files:
--------------
    slony1-engine/tools/altperl:
        Makefile (r1.6 -> r1.7)
        slon_watchdog.pl (r1.9 -> r1.10)

-------------- next part --------------
Index: slon_watchdog.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_watchdog.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -Ltools/altperl/slon_watchdog.pl -Ltools/altperl/slon_watchdog.pl -u -w -r1.9 -r1.10
--- tools/altperl/slon_watchdog.pl
+++ tools/altperl/slon_watchdog.pl
@@ -48,7 +48,7 @@
     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 "./restart_node.sh $node";
+    system "@@TOOLSBIN@@/restart_node $node | @@PGBINDIR@@/slonik";
     # Next, restart the slon process to service the node
     start_slon($nodenum);
     $pid = get_pid($node);
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.6 -r1.7
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -26,6 +26,7 @@
 		$(SED) -e "s#@@PERL@@#$(PERL)#;" \
                        -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
                        -e "s#@@PGLIBDIR@@#$(pglibdir)#;" \
+                       -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
                        -e "s#@@TOOLSBIN@@#$(toolsbin)#;" \
                        $$file > $$tmpname; \
 		chmod 755 $$tmpname; \


More information about the Slony1-commit mailing list