Author: rjung
Date: Sun Mar 11 07:49:18 2007
New Revision: 516911
URL: http://svn.apache.org/viewvc?view=rev&rev=516911
Log:
- Add STDERR logging to jk_error_exit()
- Increase log level for message about using default shm file and log file to
warning
- remove deprecated APLOG_NOERRNO for 2.0/2.2
- add virtual server instead of NULL to ap_log_error() where appropriate
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
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=516911&r1=516910&r2=516911
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Mar 11 07:49:18
2007
@@ -461,6 +461,9 @@
va_end(ap);
ap_log_error(file, line, level, s, res);
+ if ( s ) {
+ ap_log_error(file, line, level, NULL, res);
+ }
/* Exit process */
exit(1);
@@ -1744,7 +1747,7 @@
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
-
+
if (jk_map_read_property(conf->worker_properties, line, 1, conf->log) ==
JK_FALSE)
return ap_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line,
NULL);
@@ -2349,7 +2352,7 @@
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,
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, s,
"No JkLogFile defined in httpd.conf. "
"Using default %s", conf->log_file);
}
@@ -2498,7 +2501,7 @@
#endif
if (jk_shm_file)
- ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, s,
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, s,
"No JkShmFile defined in httpd.conf. "
"Using default %s", jk_shm_file);
}
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=516911&r1=516910&r2=516911
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Mar 11 07:49:18
2007
@@ -500,6 +500,9 @@
va_end(ap);
ap_log_error(file, line, level, 0, s, res);
+ if ( s ) {
+ ap_log_error(file, line, level, 0, NULL, res);
+ }
/* Exit process */
exit(1);
@@ -2449,7 +2452,7 @@
status = apr_file_write(p->jklogfp, what, &wrote);
if (status != APR_SUCCESS) {
apr_strerror(status, error, 254);
- ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0,
NULL,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
"mod_jk: jk_log_to_file %s failed: %s",
what, error);
}
@@ -2501,7 +2504,7 @@
if (conf->log_file == NULL) {
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, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
"No JkLogFile defined in httpd.conf. "
"Using default %s", conf->log_file);
}
@@ -2618,7 +2621,7 @@
if (!jk_shm_file) {
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,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
"No JkShmFile defined in httpd.conf. "
"Using default %s", jk_shm_file);
}
@@ -2638,7 +2641,7 @@
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0, NULL,
"No JkShmFile defined in httpd.conf. "
"LoadBalancer will not function properly!");
- ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, NULL,
"No JkShmFile defined in httpd.conf. "
"LoadBalancer will not function properly!");
}
@@ -2657,17 +2660,17 @@
/* if(map_alloc(&init_map)) { */
if (!jk_map_read_properties(init_map, conf->worker_file, NULL, 1,
conf->log)) {
if (jk_map_size(init_map) == 0) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0, s,
"No worker file and no worker options in httpd.conf"
"use JkWorkerFile to set workers");
}
- ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
"Error in reading worker properties");
return !OK;
}
if (jk_map_resolve_references(init_map, "worker.", 1, 1, conf->log) ==
JK_FALSE) {
- ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
"Error in resolving configuration references");
return !OK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
