costin 02/05/09 14:13:13
Modified: jk/native2/jni jk_jni_aprImpl.c
jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
Log:
As previously mentioned, less verbosity unless explicitely configured for debug
( and only debug on the targeted object )
Revision Changes Path
1.15 +1 -1 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_jni_aprImpl.c 9 May 2002 00:08:50 -0000 1.14
+++ jk_jni_aprImpl.c 9 May 2002 21:13:12 -0000 1.15
@@ -356,7 +356,7 @@
jlong poolJ, jstring hostJ )
{
apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
- char *host;
+ const char *host;
int status;
int unixSocket;
struct sockaddr_un unixAddr;
1.19 +5 -5
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_service_apache2.c 9 May 2002 00:10:57 -0000 1.18
+++ jk_service_apache2.c 9 May 2002 21:13:12 -0000 1.19
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.18 $
+ * Version: $Revision: 1.19 $
*/
#include "apu_compat.h"
@@ -108,7 +108,7 @@
return JK_ERR;
if( s->uriEnv != NULL )
- debug=s->uriEnv->debug;
+ debug=s->uriEnv->mbean->debug;
r = (request_rec *)s->ws_private;
@@ -146,8 +146,8 @@
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
if( debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "service.head() %d %d\n", s->status,
- numheaders);
+ "service.head() %d %d %p\n", s->status,
+ numheaders, s->uriEnv);
for(h = 0 ; h < numheaders; h++) {
char *name=headers->nameAt( env, headers, h );
@@ -258,7 +258,7 @@
return JK_ERR;
}
if( s->uriEnv != NULL )
- debug=s->uriEnv->debug;
+ debug=s->uriEnv->mbean->debug;
if(len==0 ) {
return JK_OK;
1.18 +21 -17 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_jk2.c 9 May 2002 00:10:57 -0000 1.17
+++ mod_jk2.c 9 May 2002 21:13:12 -0000 1.18
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***************************************************************************/
/*
@@ -302,7 +302,7 @@
workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
workerEnv->pool->pstrdup( env, workerEnv->pool,
ap_server_root));
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "Set serverRoot %s\n", ap_server_root);
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root);
/* Local initialization */
workerEnv->_private = s;
@@ -432,13 +432,13 @@
if( rc == JK_OK && gPool != NULL ) {
/* This is the first step */
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.post_config() first invocation\n");
apr_pool_userdata_set( "INITOK", "mod_jk_init", NULL, gPool );
return OK;
}
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.post_config() second invocation\n" );
@@ -524,12 +524,9 @@
r->uri, worker->mbean->name);
} else {
worker=uriEnv->worker;
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() per dir worker for %p\n",
- worker );
if( worker==NULL && uriEnv->workerName != NULL ) {
- worker=env->getByName( env, uriEnv->workerName);
+ worker=env->getByName( env, uriEnv->workerName);
env->l->jkLog(env, env->l, JK_LOG_INFO,
"mod_jk.handler() finding worker for %p %p\n",
worker, uriEnv );
@@ -544,6 +541,10 @@
return 500;
}
+ if( uriEnv->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "mod_jk.handler() serving %s with %s\n",
+ uriEnv->mbean->localName, worker->mbean->localName );
{
jk_ws_service_t sOnStack;
jk_ws_service_t *s=&sOnStack;
@@ -563,12 +564,14 @@
jk2_service_apache2_init( env, s );
s->pool = rPool;
- s->uriEnv = uriEnv;
- s->is_recoverable_error = JK_FALSE;
s->init( env, s, worker, r );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "modjk.handler() Calling %s\n", worker->mbean->name);
+ s->is_recoverable_error = JK_FALSE;
+ s->uriEnv = uriEnv;
+
+ /* env->l->jkLog(env, env->l, JK_LOG_INFO, */
+ /* "mod_jk.handler() Calling %s\n", worker->mbean->name); */
+
rc = worker->service(env, worker, s);
s->afterRequest(env, s);
@@ -653,9 +656,10 @@
ap_set_module_config( r->request_config, &jk2_module, uriEnv );
r->handler=JK_HANDLER;
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.translate(): uriMap %s %s\n",
- r->uri, uriEnv->workerName);
+ if( uriEnv->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "mod_jk.translate(): uriMap %s %s\n",
+ r->uri, uriEnv->workerName);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
return OK;
@@ -670,11 +674,11 @@
if( uriEnv != NULL ) {
r->filename = (char *)apr_filename_of_pathname(r->uri);
- if( uriEnv->debug > 0 ) {
+ /* if( uriEnv->mbean->debug > 0 ) { */
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "mod_jk.map_to_storage(): map %s %s\n", */
/* r->uri, r->filename); */
- }
+ /* } */
return OK;
}
return DECLINED;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
