You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/11/19 19:51:52 UTC
svn commit: r476880 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Author: rjung
Date: Sun Nov 19 10:51:51 2006
New Revision: 476880
URL: http://svn.apache.org/viewvc?view=rev&rev=476880
Log:
Adding the vhost to ap_log_error() where we used
NULL, but a server_rec is available.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=476880&r1=476879&r2=476880
==============================================================================
--- 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:51:51 2006
@@ -2260,7 +2260,7 @@
if (!jk_shm_file) {
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,
+ ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, s,
"No JkShmFile defined in httpd.conf. "
"Using default %s", jk_shm_file);
}
@@ -2276,7 +2276,7 @@
jk_shm_name(), rc);
#if !defined(WIN32) && !defined(NETWARE)
if (!jk_shm_file)
- ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, NULL,
+ ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s,
"No JkShmFile defined in httpd.conf. "
"LoadBalancer will not function properly!");
#endif
@@ -2309,7 +2309,7 @@
if (!jk_map_read_properties(init_map, conf->worker_file, NULL, conf->log)) {
if (jk_map_size(init_map) == 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, NULL,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, s,
"No worker file and no worker options in httpd.conf "
"use JkWorkerFile to set workers");
return;
@@ -2338,7 +2338,7 @@
return;
}
- ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
+ ap_log_error(APLOG_MARK, APLOG_ERR, s,
"Error while opening the workers, jk will not work");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org