* Set CTDLEXIT_SHUTDOWN value to 0

diff --git a/citadel/server.h b/citadel/server.h
index f9240227751fc78e682462a73f088f45eab7821c..314c7ce258020ced1a209d3127592b10a1091715 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -32,6 +32,8 @@ struct CtdlMessage {
 
 
 
+#define CTDLEXIT_SHUTDOWN      0       /* Normal shutdown; do NOT auto-restart */
+
 /*
  * Exit codes 101 through 109 are used for conditions in which
  * we deliberately do NOT want the service to automatically
@@ -43,10 +45,6 @@ struct CtdlMessage {
 #define CTDLEXIT_OOD           104     /* Out Of Date config - rerun setup */
 #define CTDLEXIT_DB            105     /* Unable to initialize database */
 #define CTDLEXIT_LIBCITADEL    106     /* Incorrect version of libcitadel */
-#define CTDLEXIT_SHUTDOWN      150     /* we're going down. watcher don't 
-                                        * fire us up again. 
-                                        */
-
 
 
 

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 4cd22d0d5ca637463b7892c23aae916fc7147156..ac654ac52c1d171e06b19b1c572cb3426f11a6cb 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -962,19 +962,24 @@ void start_daemon(int unused) {
                nFireUpsNonRestart = nFireUps;
                /* Did the main process exit with an actual exit code? */
                if (WIFEXITED(status)) {
+               
+                       CtdlLogPrintf(CTDL_DEBUG, "\e[31m WIFEXITED! \e[0m\n");
 
                        /* Exit code 0 means the watcher should exit */
                        if (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN) {
+                               CtdlLogPrintf(CTDL_DEBUG, "\e[31m CTDLEXIT_SHUTDOWN \e[0m\n");
                                do_restart = 0;
                        }
 
                        /* Exit code 101-109 means the watcher should exit */
                        else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
+                               CtdlLogPrintf(CTDL_DEBUG, "\e[31m CTDLEXIT NO RESTART \e[0m\n");
                                do_restart = 0;
                        }
 
                        /* Any other exit code means we should restart. */
                        else {
+                               CtdlLogPrintf(CTDL_DEBUG, "\e[31m ANY OTHER EXIT CODE \e[0m\n");
                                do_restart = 1;
                                nFireUps++;
                                ForkedPid = current_child;
@@ -983,6 +988,7 @@ void start_daemon(int unused) {
 
                /* Any other type of termination (signals, etc.) should also restart. */
                else {
+                       CtdlLogPrintf(CTDL_DEBUG, "\e[31m NON-EXIT TERMINATION \e[0m\n");
                        do_restart = 1;
                        nFireUps++;
                        ForkedPid = current_child;