From c9a2b376fee4a88c31654b5a285734f1f2ee6169 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 6 Apr 2009 20:52:56 +0000
Subject: [PATCH] * Set CTDLEXIT_SHUTDOWN value to 0

---
 citadel/server.h | 6 ++----
 citadel/sysdep.c | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/citadel/server.h b/citadel/server.h
index f92402277..314c7ce25 100644
--- 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 4cd22d0d5..ac654ac52 100644
--- 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, " WIFEXITED! \n");
 
 			/* Exit code 0 means the watcher should exit */
 			if (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN) {
+				CtdlLogPrintf(CTDL_DEBUG, " CTDLEXIT_SHUTDOWN \n");
 				do_restart = 0;
 			}
 
 			/* Exit code 101-109 means the watcher should exit */
 			else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
+				CtdlLogPrintf(CTDL_DEBUG, " CTDLEXIT NO RESTART \n");
 				do_restart = 0;
 			}
 
 			/* Any other exit code means we should restart. */
 			else {
+				CtdlLogPrintf(CTDL_DEBUG, " ANY OTHER EXIT CODE \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, " NON-EXIT TERMINATION \n");
 			do_restart = 1;
 			nFireUps++;
 			ForkedPid = current_child;
-- 
2.39.2