Changeset 1549

Timestamp:

06/14/08 11:57:19 (3 months ago)

Author:

alo

Message:

--

Files:

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

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-06-14  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/main_guardian.c: Improves PID file management. Now it
+        cleans it up before exiting.
+
-2008-06-13  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/main_guardian.c

@@ -27 +27 @@
-#include <unistd.h>
-#include <sys/wait.h>
+#include <sys/stat.h>
-#include <errno.h>
-#include "server.h"
@@ -41 +42 @@
-static pid_t              pid;
-
+static void
+pid_file_save (const char *pid_file, int pid)
+{
+        FILE *file;
+        char  tmp[10];
+
+        file = fopen (pid_file, "w+");
+        if (file == NULL) {
+                PRINT_MSG ("Cannot write PID file '%s'\n", pid_file);
+                return;
+        }
+
+        snprintf (tmp, sizeof(tmp), "%d\n", pid);
+        fwrite (tmp, 1, strlen(tmp), file);
+        fclose (file);
+}
+
+static void
+pid_file_clean (const char *pid_file)
+{
+        struct stat info;
+
+        if (lstat (pid_file, &info) != 0) 
+                return;
+        if (! S_ISREG(info.st_mode))
+                return;
+        if (info.st_uid != getuid())
+                return;
+        if (info.st_size > sizeof("65535\r\n"))
+                return;
+
+        unlink (pid_file);
+}
-
-static ret_t
@@ -68 +102 @@
-}
-
-
-static void 
-guardian_signals_handler (int sig, siginfo_t *si, void *context) 
@@ -93 +126 @@
-                kill (pid, SIGTERM);
-                process_wait (pid);
+                pid_file_clean (PID_FILE);
-                exit(0);
-
@@ -164 +198 @@
-}
-
-
-static void
-save_pid_file (int pid)
-{
-        FILE *file;
-        char  tmp[10];
-
-        UNUSED(pid);
-
-        file = fopen (PID_FILE, "w+");
-        if (file == NULL) {
-                PRINT_MSG ("Cannot write PID file '%s'\n", PID_FILE);
-                return;
-        }
-
-        snprintf (tmp, sizeof(tmp), "%d\n", getpid());
-        fwrite (tmp, 1, strlen(tmp), file);
-        fclose (file);
-}
-
-static cherokee_boolean_t
-is_single_execution (int argc, char *argv[])
@@ -209 +223 @@
-        single_time = is_single_execution (argc, argv);
-
+        if (! single_time)
+                pid_file_save (PID_FILE, getpid());
+
-        do {
-                pid = process_launch (CHEROKEE_SRV_PATH, argc, argv);
@@ -216 +233 @@
-                }
-
-
-
-
-
-
+
-                if (single_time)
-                        break;
@@ -229 +242 @@
-        } while (! exit_guardian);
-
+        pid_file_clean (PID_FILE);
-        return 0;
-}