Log Message:
-----------
- Jan Wieck added the following to the 1.2 branch; add this to HEAD
  as well

Let the watchdog restart the worker process immediately if it
terminated with exit code zero, instead of waiting for 10 seconds.

Added test_J to the ducttape suite. The test is a cascaded 3 node
setup using a separate set for each of the pgbench tables.

Modified Files:
--------------
    slony1-engine/src/slon:
        slon.c (r1.67 -> r1.68)

Added Files:
-----------
    slony1-engine/src/ducttape:
        test_J_handover_to_2 (r1.2)
        test_J_pgbench.in (r1.2)

-------------- next part --------------
Index: slon.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.67 -r1.68
--- src/slon/slon.c
+++ src/slon/slon.c
@@ -29,7 +29,12 @@
 #include "port/win32service.h"
 #endif
 
+#include "libpq-fe.h"
+#include "c.h"
+ 
 #include "slon.h"
+#include "confoptions.h"
+
 
 
 /* ---------- 
@@ -856,8 +861,15 @@
 		case SLON_WATCHDOG_NORMAL:
 		case SLON_WATCHDOG_RETRY:
 			watchdog_status = SLON_WATCHDOG_RETRY;
+			if (child_status != 0)
+			{
 			slon_log(SLON_DEBUG1, "slon: restart of worker in 10 seconds\n");
 			sleep(10);
+			}
+			else
+			{
+				slon_log(SLON_DEBUG1, "slon: restart of worker\n");
+			}
 			if (watchdog_status == SLON_WATCHDOG_RETRY)
 			{
 				execvp(main_argv[0], main_argv);