costin 02/05/09 16:47:32
Modified: jk/native2/common jk_channel_socket.c jk_channel_un.c
jk_env.c jk_shm.c jk_workerEnv.c jk_worker_ajp13.c
jk_worker_lb.c
jk/native2/jni jk_jni_aprImpl.c
Log:
reduce verbosity.
Make sure we try all available workers before giving up.
Revision Changes Path
1.23 +4 -2 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_channel_socket.c 9 May 2002 21:12:15 -0000 1.22
+++ jk_channel_socket.c 9 May 2002 23:47:31 -0000 1.23
@@ -276,8 +276,10 @@
/* Tries to connect to JServ (continues trying while error is EINTR) */
do {
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelSocket.open() connect on %d\n",sock);
+ if( ch->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channelSocket.open() connect on %d\n",sock);
+
ret = connect(sock,(struct sockaddr *)addr,
sizeof(struct sockaddr_in));
1.2 +22 -17 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Index: jk_channel_un.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_channel_un.c 9 May 2002 00:05:14 -0000 1.1
+++ jk_channel_un.c 9 May 2002 23:47:31 -0000 1.2
@@ -123,7 +123,7 @@
{
jk_channel_un_private_t *socketInfo=
(jk_channel_un_private_t *)(_this->_privatePtr);
- int rc;
+ int rc=JK_OK;
if( socketInfo->file==NULL ) {
char *localName=_this->mbean->localName;
@@ -147,10 +147,10 @@
strcpy(socketInfo->unix_addr.sun_path, socketInfo->file );
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelApr.resolve(): create AF_UNIX %s\n",
socketInfo->file );
+ "channelUn.init(): create AF_UNIX %s\n", socketInfo->file );
} else {
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "jk2_channel_un_init: "
- "can't resolve %s errno=%d\n", socketInfo->file, errno );
+ env->l->jkLog(env, env->l, JK_LOG_ERROR, "channelUn.init(): "
+ "can't init %s errno=%d\n", socketInfo->file, errno );
}
return rc;
@@ -175,8 +175,9 @@
return JK_ERR;
}
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelApr.open(): create unix socket %s %d\n",
socketInfo->file, unixsock );
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channelApr.open(): create unix socket %s %d\n",
socketInfo->file, unixsock );
if (connect(unixsock,(struct sockaddr *)&(socketInfo->unix_addr),
sizeof(struct sockaddr_un))<0) {
@@ -186,8 +187,9 @@
errno, strerror( errno ) );
return JK_ERR;
}
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelApr.open(): connect unix socket %d %s\n", unixsock,
socketInfo->file );
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channelApr.open(): connect unix socket %d %s\n", unixsock,
socketInfo->file );
/* store the channel information */
endpoint->sd=unixsock;
@@ -234,10 +236,11 @@
/* this_time = send(unixsock, (char *)b + sent , len - sent, 0); */
errno=0;
this_time = write(unixsock, (char *)b + sent , len - sent);
-
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channel.apr:send() write() %d %d %s\n", this_time, errno,
- strerror( errno));
+
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel.apr:send() write() %d %d %s\n", this_time, errno,
+ strerror( errno));
/* if( errno != 0 ) { */
/* env->l->jkLog(env, env->l, JK_LOG_ERROR, */
/* "channel.apr:send() send() %d %d %s\n", this_time,
errno, */
@@ -330,9 +333,10 @@
return JK_ERR;
}
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelApr.receive(): Received len=%d type=%d\n",
- blen, (int)msg->buf[hlen]);
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channelApr.receive(): Received len=%d type=%d\n",
+ blen, (int)msg->buf[hlen]);
return JK_OK;
}
@@ -373,8 +377,9 @@
jk_bean_t *result,
const char *type, const char *name)
{
- env->l->jkLog( env, env->l, JK_LOG_INFO,
- "channelUn.factory(): Error receiving message body %d %d\n",
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
+ "channelUn.factory(): Support for unix sockets is disabled, "
+ "you need to set HAVE_UNIXSOCKETS at compile time\n",
return JK_FALSE;
}
#endif
1.24 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_env.c 9 May 2002 21:12:15 -0000 1.23
+++ jk_env.c 9 May 2002 23:47:31 -0000 1.24
@@ -79,7 +79,7 @@
jk_env_globalEnv->globalPool = pool;
jk2_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
- fprintf( stderr, "env: top level env %p\n", jk_env_globalEnv);
+ /* fprintf( stderr, "env: top level env %p\n", jk_env_globalEnv); */
}
return jk_env_globalEnv;
}
1.12 +10 -6 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_shm.c 9 May 2002 00:05:14 -0000 1.11
+++ jk_shm.c 9 May 2002 23:47:31 -0000 1.12
@@ -406,21 +406,25 @@
int code=msg->getByte(env, msg );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "shm.%d() \n", code);
+ if( shm->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "shm.%d() \n", code);
+
switch( code ) {
case SHM_SET_ATTRIBUTE: {
char *name=msg->getString( env, msg );
char *value=msg->getString( env, msg );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "shm.setAttribute() %s %s %p\n", name, value,
bean->setAttribute);
+ if( shm->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "shm.setAttribute() %s %s %p\n", name, value,
bean->setAttribute);
if( bean->setAttribute != NULL)
bean->setAttribute(env, bean, name, value );
return JK_OK;
}
case SHM_ATTACH: {
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "shm.init()\n");
+ if( shm->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "shm.init()\n");
rc=shm->init(env, shm);
return rc;
}
1.39 +2 -2 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_workerEnv.c 9 May 2002 21:49:01 -0000 1.38
+++ jk_workerEnv.c 9 May 2002 23:47:31 -0000 1.39
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.38 $ *
+ * Version: $Revision: 1.39 $ *
***************************************************************************/
#include "jk_env.h"
@@ -587,7 +587,7 @@
wEnv=(jk_workerEnv_t *)pool->calloc( env, pool, sizeof( jk_workerEnv_t ));
- env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Creating workerEnv %p\n", wEnv);
+ /* env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Creating workerEnv %p\n", wEnv); */
result->object=wEnv;
wEnv->mbean=result;
1.17 +4 -0 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_worker_ajp13.c 9 May 2002 21:03:45 -0000 1.16
+++ jk_worker_ajp13.c 9 May 2002 23:47:31 -0000 1.17
@@ -612,6 +612,10 @@
if(ajp14->channel != NULL &&
ajp14->channel->mbean->debug > 0 )
ajp14->mbean->debug = 1;
+
+ if(ajp14->channel != NULL &&
+ ajp14->channel->mbean->disabled )
+ ajp14->mbean->disabled = JK_TRUE;
if( ajp14->cache_sz == -1 )
ajp14->cache_sz=JK_OBJCACHE_DEFAULT_SZ;
1.13 +12 -10 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_worker_lb.c 9 May 2002 21:06:48 -0000 1.12
+++ jk_worker_lb.c 9 May 2002 23:47:31 -0000 1.13
@@ -73,9 +73,8 @@
#define DEFAULT_LB_FACTOR (1.0)
-/* Time to wait before retry... */
-/* XXX make it longer - debugging only */
-#define WAIT_BEFORE_RECOVER (5)
+/* Time to wait before retry... XXX make it configurable*/
+#define WAIT_BEFORE_RECOVER (60)
#define MAX_ATTEMPTS 3
@@ -189,6 +188,7 @@
if ( rc==NULL ) {
/* no workers found (rc is null), now try as hard as possible to get a
worker anyway, pick one with largest error time.. */
+ int error_workers=0;
env->l->jkLog(env, env->l, JK_LOG_INFO,
"lb.getWorker() All workers in error state, use the one with
oldest error\n");
@@ -199,6 +199,8 @@
if( w->mbean->disabled == JK_TRUE ) continue;
+ error_workers++;
+
if( rc==NULL ) {
rc= w;
currentLevel=level;
@@ -211,6 +213,13 @@
}
}
}
+
+ if( attempt >= error_workers ) {
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "lb.getWorker() We tried all possible workers %d\n",
attempt );
+ return NULL;
+
+ }
}
if(rc!=NULL) {
@@ -484,13 +493,6 @@
jk_worker_t *rec;
int rc;
- /* Prevent loops */
- if( attempt > MAX_ATTEMPTS ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "lb.service() max attempts exceeded %d\n", attempt);
- return JK_ERR;
- }
-
rec=jk2_get_most_suitable_worker(env, lb, s, attempt);
attempt++;
1.16 +4 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_jni_aprImpl.c 9 May 2002 21:13:12 -0000 1.15
+++ jk_jni_aprImpl.c 9 May 2002 23:47:32 -0000 1.16
@@ -98,6 +98,7 @@
static apr_pool_t *jniAprPool;
static jk_workerEnv_t *workerEnv;
+static int jniDebug=0;
/* -------------------- Apr initialization and pools -------------------- */
@@ -555,8 +556,9 @@
if( jk_env_globalEnv != NULL )
jk_env_globalEnv->releaseEnv( jk_env_globalEnv, env );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "aprImpl.releaseJkEnv() %p\n", env);
+ if( jniDebug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "aprImpl.releaseJkEnv() %p\n", env);
}
/*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
