You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by or...@apache.org on 2001/08/27 22:50:01 UTC
cvs commit: httpd-2.0/modules/loggers mod_log_config.c mod_log_config.h
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