* Changed the WIFEXITED logic to eliminate duplicate code.

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index ac654ac52c1d171e06b19b1c572cb3426f11a6cb..9af1a578989bcbf3b4368c1b3776643b60c5353c 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -960,35 +960,19 @@ void start_daemon(int unused) {
                }
                do_restart = 0;
                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;
-                       }
+               /* Exit code 0 means the watcher should exit */
+               if (WIFEXITED(status) && (WEXITSTATUS(status) == CTDLEXIT_SHUTDOWN)) {
+                       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;
-                       }
+               /* Exit code 101-109 means the watcher should exit */
+               else if (WIFEXITED(status) && (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109)) {
+                       do_restart = 0;
                }
 
-               /* Any other type of termination (signals, etc.) should also restart. */
+               /* Any other exit code, or no exit code, means we should restart. */
                else {
-                       CtdlLogPrintf(CTDL_DEBUG, "\e[31m NON-EXIT TERMINATION \e[0m\n");
                        do_restart = 1;
                        nFireUps++;
                        ForkedPid = current_child;