costin 02/05/30 11:24:10
Modified: jk/native2/common jk_workerEnv.c jk_worker_ajp13.c
Log:
If no explicit setAttribute( "logger" ) is configured, use the default
server-specific logger.
Without this apache native logger will be replaced with the file logger.
Also ( to avoid beeing acused I send too many commits ) a small fix in
ajp13 to better display the status.
Revision Changes Path
1.49 +2 -3 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jk_workerEnv.c 29 May 2002 00:40:44 -0000 1.48
+++ jk_workerEnv.c 30 May 2002 18:24:09 -0000 1.49
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.48 $ *
+ * Version: $Revision: 1.49 $ *
***************************************************************************/
#include "jk_env.h"
@@ -695,7 +695,7 @@
ARCH, NULL );
- wEnv->logger_name = "logger.file";
+ wEnv->logger_name = NULL;
wEnv->was_initialized = JK_FALSE;
wEnv->options = JK_OPT_FWDURIDEFAULT;
@@ -786,7 +786,6 @@
} else {
env->alias(env, "shm:", "shm");
wEnv->shm=(jk_shm_t *)jkb->object;
- wEnv->shm->setWorkerEnv( env, wEnv->shm, wEnv );
}
JK_INIT_CS(&(wEnv->cs), csOk);
1.26 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_worker_ajp13.c 23 May 2002 14:54:07 -0000 1.25
+++ jk_worker_ajp13.c 30 May 2002 18:24:09 -0000 1.26
@@ -117,12 +117,12 @@
if( worker->in_error_state )
return "Y";
else
- return NULL;
+ return "N";
} else if (strcmp( name, "graceful" )==0 ) {
- if( worker->mbean->disabled )
+ if( worker->mbean->disabled != 0)
return "Y";
else
- return NULL;
+ return "N";
} else if (strcmp( name, "epCount" )==0 ) {
char *result;
if( worker->endpointCache==NULL ) return "0";
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
