Return-Path: Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 4733 invoked by uid 500); 27 Aug 2001 20:50:22 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 4711 invoked from network); 27 Aug 2001 20:50:21 -0000 Received: from icarus.apache.org (64.125.133.21) by daedalus.apache.org with SMTP; 27 Aug 2001 20:50:21 -0000 Received: (qmail 73413 invoked by uid 1230); 27 Aug 2001 20:50:01 -0000 Date: 27 Aug 2001 20:50:01 -0000 Message-ID: <20010827205001.73412.qmail@icarus.apache.org> From: orlikowski@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/loggers mod_log_config.c mod_log_config.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Status: O X-Status: X-Keywords: X-UID: 562 orlikowski 01/08/27 13:50:01 Modified: modules/loggers mod_log_config.c mod_log_config.h Log: Fix a case where on restart, an admin started logging, and the logging code waited to start until the second pass (assuming we were just starting up) to open the log file. Also fix a typo. Revision Changes Path 1.68 +5 -2 httpd-2.0/modules/loggers/mod_log_config.c Index: mod_log_config.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- mod_log_config.c 2001/08/20 19:43:03 1.67 +++ mod_log_config.c 2001/08/27 20:50:01 1.68 @@ -236,7 +236,7 @@ * vhost has no logs defined, we can use the main server's logs instead. * * So, for the main server, config_logs contains a list of the log files - * and server_config_logs in empty. For a vhost, server_config_logs + * and server_config_logs is empty. For a vhost, server_config_logs * points to the same array as config_logs in the main server, and * config_logs points to the array of logs defined inside this vhost, * which might be empty. @@ -1025,7 +1025,10 @@ if (!data) { apr_pool_userdata_set((const void *)1, userdata_key, apr_pool_cleanup_null, s->process->pool); - return cls; + /* If logging for the first time after a restart, keep going. */ + if (!ap_my_generation) { + return cls; + } } if (cls->log_fd != NULL) { 1.2 +1 -0 httpd-2.0/modules/loggers/mod_log_config.h Index: mod_log_config.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_log_config.h 2001/04/18 22:29:31 1.1 +++ mod_log_config.h 2001/08/27 20:50:01 1.2 @@ -58,6 +58,7 @@ #include "apr_optional.h" #include "httpd.h" +#include "scoreboard.h" #ifndef _MOD_LOG_CONFIG_H #define _MOD_LOG_CONFIG_H 1