You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/04/11 21:34:56 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
costin 02/04/11 12:34:56
Modified: jk/native2/common jk_worker_ajp13.c
Log:
Fix channel initialization, better messages.
Revision Changes Path
1.7 +17 -15 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_worker_ajp13.c 27 Mar 2002 18:58:57 -0000 1.6
+++ jk_worker_ajp13.c 11 Apr 2002 19:34:55 -0000 1.7
@@ -213,6 +213,9 @@
"ajp14.connect() no channel %s\n", ae->worker->mbean->name );
return JK_FALSE;
}
+
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "ajp14.connect() %s %s\n", ae->worker->channelName, channel->mbean->name );
err=channel->open( env, channel, ae );
@@ -293,8 +296,8 @@
}
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "ajp14.service() error sending, retry on a new endpoint %s\n",
- e->worker->mbean->name);
+ "ajp14.service() error sending, reconnect %s %s\n",
+ e->worker->mbean->name, e->worker->channelName);
channel->close( env, channel, e );
@@ -628,23 +631,22 @@
return JK_FALSE;
}
ajp14->channel = chB->object;
- }
- if( ajp14->channel == NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "ajp14.init(): no channel found %s\n",
- ajp14->channelName);
- return JK_FALSE;
+ if( ajp14->channel == NULL ) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "ajp14.init(): no channel found %s\n",
+ ajp14->channelName);
+ return JK_FALSE;
+ }
+ rc=ajp14->workerEnv->initChannel( env, ajp14->workerEnv, ajp14->channel );
+ if( rc != JK_TRUE ) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "ajp14.init(): channel init failed\n");
+ }
}
-
+
ajp14->channel->worker=ajp14;
- rc=ajp14->channel->init( env, ajp14->channel );
- if( rc != JK_TRUE ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "ajp14.init(): channel init failed\n");
- return rc;
- }
return JK_TRUE;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>