Changeset 1547

Timestamp:

06/13/08 21:01:36 (4 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/main_guardian.c (modified) (3 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-06-13  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/main_guardian.c: Do not loop when the operation is
+        meant to happen a single time. Reported by Gunnar Wolf.
-
-        * cherokee/main_guardian.c (save_pid_file): Bug fix: Do not try to

cherokee/trunk/cherokee/main_guardian.c

@@ -34 +34 @@
-#endif
-
-ERROR_DELAY
-RESTARTING_DELAY
+DELAY_ERROR
+DELAY_RESTARTING
-#define PID_FILE          CHEROKEE_VAR_RUN "/cherokee-guardian.pid"
-
@@ -184 +184 @@
-}
-
+static cherokee_boolean_t
+is_single_execution (int argc, char *argv[])
+{
+        int i;
+
+        for (i=0; i<argc; i++) {
+                if (!strcmp (argv[i], "-t") || !strcmp (argv[i], "--test")    ||
+                    !strcmp (argv[i], "-h") || !strcmp (argv[i], "--help")    ||
+                    !strcmp (argv[i], "-V") || !strcmp (argv[i], "--version") ||
+                    !strcmp (argv[i], "-i") || !strcmp (argv[i], "--print-server-info"))
+                        return true;
+        }
+
+        return false;
+}
-
-int
-main (int argc, char *argv[])
-{
-
+
+
-
-        set_guardian_signals();    
-
-
+
+
+
-                pid = process_launch (CHEROKEE_SRV_PATH, argc, argv);
-                if (pid < 0) {
@@ -198 +215 @@
-                        exit (1);
-                }
+
+                if (! single_time) 
+                        save_pid_file(pid);
+
+                ret = process_wait (pid);
-                
-
-
-
-
-
+
+
+
+
+
+
+
-
-        return 0;