Changeset 1930

Timestamp:

09/01/08 13:09:50 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (4 diffs)
• cherokee/trunk/cherokee/virtual_server.c (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-09-01  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/virtual_server.c, cherokee/server.c: The log opening
+        order has changed. Now it creates the log files as the web server
+        user (instead of root, in case it was launched as super-user).
-
-        * cherokee/logger_writer.c: Open the logs with perms 0640 rather

cherokee/trunk/cherokee/server.c

@@ -809 +809 @@
-}
-
+static ret_t
+initialize_loggers (cherokee_server_t *srv)
+{       
+        ret_t              ret;
+        cherokee_list_t   *i;
+        cherokee_logger_t *logger;
+
+        list_for_each (i, &srv->vservers) {
+                logger = VSERVER(i)->logger;
+                if (logger == NULL)
+                        continue;
+
+                ret = cherokee_logger_init (logger);
+                if (ret != ret_ok)
+                        return ret;
+        }
+
+        return ret_ok;
+}
-
-static ret_t
@@ -929 +948 @@
-cherokee_server_initialize (cherokee_server_t *srv) 
-{   
-
-
-
+
+
+
+
-
-        /* Build the server string
@@ -1025 +1045 @@
-         */
-        if (! cherokee_buffer_is_empty (&srv->chroot)) {
+                /* Open the logs */
+                ret = initialize_loggers (srv);
+                if (unlikely(ret < ret_ok))
+                        return ret;
+
+                loggers_done = true;
+
+                /* Jail the process */
-                re = chroot (srv->chroot.buf);
-                srv->chrooted = (re == 0);
@@ -1046 +1074 @@
-                PRINT_ERRNO_S (errno, "Couldn't chdir(\"/\"): '${errno}'");
-                return ret_error;
+        }
+
+        /* Initialize loggers
+         */
+        if (! loggers_done) {
+                ret = initialize_loggers (srv);
+                if (unlikely(ret < ret_ok))
+                        return ret;
-        }
-

cherokee/trunk/cherokee/virtual_server.c

@@ -898 +898 @@
-                return ret;
-
-        /* Logger initialization
-         */
-        ret = cherokee_logger_init (vserver->logger);
-        if (ret != ret_ok)
-                return ret;
-
-        return ret_ok;
-}