Author: rjung
Date: Sun Nov 19 10:17:01 2006
New Revision: 476865
URL: http://svn.apache.org/viewvc?view=rev&rev=476865
Log:
Adding a default location for the log file
and a message, if the default gets used.
Making a define out of the default JkShmFile location.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_global.h
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=476865&r1=476864&r2=476865
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Nov 19 10:17:01
2006
@@ -61,6 +61,8 @@
#include "jk_ajp13.h"
#include "jk_shm.h"
+#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
+#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
#define JK_ENV_WORKER_NAME ("JK_WORKER_NAME")
#define JK_NOTE_WORKER_NAME ("JK_WORKER_NAME")
#define JK_NOTE_WORKER_TYPE ("JK_WORKER_TYPE")
@@ -2186,7 +2188,15 @@
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
- if (!conf->log_file || conf->log_fd >= 0)
+ if (!s->is_virtual && !conf->log_file) {
+ conf->log_file = ap_server_root_relative(p, JK_LOG_DEF_FILE);
+ if (conf->log_file)
+ ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, s,
+ "No JkLogFile defined in httpd.conf. "
+ "Using default %s", conf->log_file);
+ }
+
+ if (s->is_virtual && (!conf->log_file || conf->log_fd >= 0))
return; /* virtual log shared w/main server */
if (*conf->log_file == '|') {
@@ -2248,7 +2258,7 @@
open_jk_log(t, p);
#if !defined(WIN32) && !defined(NETWARE)
if (!jk_shm_file) {
- jk_shm_file = ap_server_root_relative(p, "logs/jk-runtime-status");
+ jk_shm_file = ap_server_root_relative(p, JK_SHM_DEF_FILE);
if (jk_shm_file)
ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, NULL,
"No JkShmFile defined in httpd.conf. "
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=476865&r1=476864&r2=476865
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Nov 19 10:17:01
2006
@@ -109,6 +109,8 @@
#include "jk_worker.h"
#include "jk_shm.h"
+#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
+#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
#define JK_ENV_WORKER_NAME ("JK_WORKER_NAME")
#define JK_NOTE_WORKER_NAME ("JK_WORKER_NAME")
#define JK_NOTE_WORKER_TYPE ("JK_WORKER_TYPE")
@@ -2365,7 +2367,12 @@
return 0;
}
if (conf->log_file == NULL) {
- return 0;
+ conf->log_file = ap_server_root_relative(pconf, JK_LOG_DEF_FILE);
+ if (conf->log_file)
+ ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
+ 0, NULL,
+ "No JkLogFile defined in httpd.conf. "
+ "Using default %s", conf->log_file);
}
if (*(conf->log_file) == '\0') {
return 0;
@@ -2469,7 +2476,7 @@
#if !defined(WIN32) && !defined(NETWARE)
if (!jk_shm_file) {
- jk_shm_file = ap_server_root_relative(pconf, "logs/jk-runtime-status");
+ jk_shm_file = ap_server_root_relative(pconf, JK_SHM_DEF_FILE);
if (jk_shm_file)
ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
0, NULL,
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=476865&r1=476864&r2=476865
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Sun Nov 19 10:17:01
2006
@@ -171,6 +171,8 @@
#define JK_TRUE (1)
#define JK_FALSE (0)
+#define JK_UNSET (-1)
+
#define JK_LF (10)
#define JK_CR (13)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
