costin 01/11/16 14:55:34
Modified: jk/native/apache-2.0 mod_jk.c
Log:
A bit more debugging, a bit cleaner ifs, don't try to read workers.properties
if none is set up.
( the settings in worker.properties can be done in httpd.conf - it's easier for
testing/debugging to edit a single file )
Revision Changes Path
1.36 +12 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_jk.c 2001/11/06 00:13:01 1.35
+++ mod_jk.c 2001/11/16 22:55:34 1.36
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.35 $ *
+ * Version: $Revision: 1.36 $ *
***************************************************************************/
/*
@@ -1181,7 +1181,7 @@
if(strcmp(r->handler,JK_HANDLER)) /* not for me, try next handler */
return DECLINED;
-
+
conf = (jk_server_conf_t *)ap_get_module_config(r->server->module_config,
&jk_module);
worker_name = apr_table_get(r->notes, JK_WORKER_ID);
@@ -1189,7 +1189,7 @@
/* Set up r->read_chunked flags for chunked encoding, if present */
if(rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
- return rc;
+ return rc;
}
if( worker_name == NULL ) {
@@ -1204,7 +1204,7 @@
explicitely give control to us. */
worker_name= worker_env.first_worker;
jk_log(xl, JK_LOG_DEBUG,
- "Manual configuration for %s %s %d\n",
+ "Manual configuration for %s (%s) %d\n",
r->uri, worker_env.first_worker, worker_env.num_of_workers);
} else {
worker_name = map_uri_to_worker(conf->uw_map, r->uri, xl);
@@ -1273,6 +1273,7 @@
apr_pool_t *tpool= apr_pool_get_parent( parent_pool );
apr_pool_userdata_get( &end, "jk_thread_endpoint", tpool );
+ jk_log(xl, JK_LOG_DEBUG, "Using per-thread worker %lx\n ", end );
if(end==NULL ) {
worker->get_endpoint(worker, &end, xl);
apr_pool_userdata_set( end , "jk_thread_endpoint",
@@ -1478,7 +1479,6 @@
stuff )
*/
static void init_jk( apr_pool_t *pconf, jk_server_conf_t *conf, server_rec *s ) {
- /* jk_map_t *init_map = NULL; */
jk_map_t *init_map = conf->worker_properties;
if(conf->log_file && conf->log_level >= 0) {
@@ -1496,7 +1496,11 @@
}
/* if(map_alloc(&init_map)) { */
- if( ! map_read_properties(init_map, conf->worker_file)) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Reading map %s %d\n", conf->worker_file, map_size( init_map ) );
+
+ if( (conf->worker_file != NULL ) &&
+ ! map_read_properties(init_map, conf->worker_file)) {
if( map_size( init_map ) == 0 ) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s,
pconf, "No worker file and no worker options in
httpd.conf \n"
@@ -1504,6 +1508,8 @@
return;
}
}
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Read map %s %d\n", conf->worker_file, map_size( init_map ) );
/* we add the URI->WORKER MAP since workers using AJP14
will feed it */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
