costin 02/05/03 11:10:58
Modified: jk/native2/common jk_channel_apr_socket.c jk_worker_lb.c
jk_worker_status.c
Log:
Few fixes. Check errno after using unix socket
Revision Changes Path
1.12 +9 -2
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_channel_apr_socket.c 3 May 2002 17:39:40 -0000 1.11
+++ jk_channel_apr_socket.c 3 May 2002 18:10:58 -0000 1.12
@@ -444,8 +444,15 @@
while(sent < len) {
this_time = send(unixsock, (char *)b + sent , len - sent, 0);
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "channel.apr:send() send() %d %d\n", this_time, errno);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel.apr:send() send() %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,
+ strerror( errno));
+ return -2;
+ }
if(0 == this_time) {
return -2;
}
1.6 +2 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_worker_lb.c 3 May 2002 17:49:04 -0000 1.5
+++ jk_worker_lb.c 3 May 2002 18:10:58 -0000 1.6
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -361,6 +361,7 @@
rec->in_recovering = JK_FALSE;
rec->retry_count = 0;
rec->error_time = 0;
+ rc->errCnt++;
/* the endpoint that succeeded is saved for done() */
s->realWorker = rec;
return JK_OK;
1.17 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_worker_status.c 3 May 2002 17:37:35 -0000 1.16
+++ jk_worker_status.c 3 May 2002 18:10:58 -0000 1.17
@@ -138,7 +138,7 @@
s->jkprintf(env, s, "</tr><tr><td>%s</td>\n", mbean->localName);
for( j=0; mbean->getAttributeInfo[j] != NULL; j++ ) {
char *pname=mbean->getAttributeInfo[j];
-
+
s->jkprintf(env, s, "<td>%s</td>",
mbean->getAttribute( env, mbean, pname));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
