Neither 'cherokee' nor 'cherokee-worker' returned a error on the

process retcode when the initialization failed. git-svn-id: svn://cherokee-project.com/cherokee/trunk@6876 5dc97367-97f1-0310-9951-d761b3857238
cherokee · Oct 1, 2011 · 2c8bc6f · 2c8bc6f
1 parent 030c268
commit 2c8bc6f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/cherokee/macros.h b/cherokee/macros.h
@@ -115,9 +115,10 @@
 #define FD_NUM_MIN_PER_THREAD         8         /* range:  8 ... 65000 */
 #define FD_NUM_CUSTOM_LIMIT           4096      /* range: 16 ... 65000 */
 
-#define EXIT_OK                        0
+#define EXIT_OK                       0
-#define EXIT_ERROR                     1
+#define EXIT_ERROR                    1
-#define EXIT_OK_ONCE                   2
+#define EXIT_OK_ONCE                  2
+#define EXIT_ERROR_FATAL              3
 
 #if (FD_NUM_MIN_SYSTEM < 16)
 # error FD_NUM_MIN_SYSTEM too low, < 16

diff --git a/cherokee/main.c b/cherokee/main.c
@@ -875,6 +875,10 @@ process_wait (pid_t pid)
 		if (re == EXIT_OK_ONCE) {
 			clean_up();
 			exit (EXIT_OK);
+
+		} else if (re == EXIT_ERROR_FATAL) {
+			clean_up();
+			exit (EXIT_ERROR);
 		}
 
 		/* Child terminated normally */

diff --git a/cherokee/main_worker.c b/cherokee/main_worker.c
@@ -361,11 +361,14 @@ main (int argc, char **argv)
 	cherokee_init();
 
 	ret = cherokee_server_new (&srv);
-	if (ret < ret_ok) return 1;
+	if (ret < ret_ok) {
+		exit (EXIT_ERROR_FATAL);
+	}
 
 	ret = process_parameters (argc, argv);
-	if (ret != ret_ok)
+	if (ret != ret_ok) {
-		exit (EXIT_OK_ONCE);
+		exit (EXIT_ERROR_FATAL);
+	}
 
 	if (print_modules) {
 		cherokee_info_build_print (srv);
@@ -374,13 +377,16 @@ main (int argc, char **argv)
 
 	if (just_test) {
 		ret = test_configuration_file();
-		if (ret != ret_ok)
+		if (ret != ret_ok) {
-			exit(EXIT_ERROR);
+			exit (EXIT_ERROR);
+		}
 		exit (EXIT_OK_ONCE);
 	}
 
 	ret = common_server_initialization (srv);
-	if (ret < ret_ok) return 2;
+	if (ret < ret_ok) {
+		exit (EXIT_ERROR_FATAL);
+	}
 
 	do {
 		ret = cherokee_server_step (srv);
@@ -391,5 +397,6 @@ main (int argc, char **argv)
 
 	free (config_file);
 	cherokee_mrproper();
+
 	return EXIT_OK;
 }