Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 2220 invoked from network); 30 Oct 2002 21:18:01 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 30 Oct 2002 21:18:01 -0000 Received: (qmail 19264 invoked by uid 97); 30 Oct 2002 21:18:46 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 19178 invoked by uid 97); 30 Oct 2002 21:18:45 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 19167 invoked by uid 97); 30 Oct 2002 21:18:45 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 30 Oct 2002 21:17:34 -0000 Message-ID: <20021030211734.82351.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c jk_lb_worker.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 2002/10/30 13:17:34 Modified: jk/native/common jk_ajp_common.c jk_lb_worker.c Log: Change some of the important messages to a more readable format. Revision Changes Path 1.31 +17 -17 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c Index: jk_ajp_common.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- jk_ajp_common.c 20 Sep 2002 11:28:16 -0000 1.30 +++ jk_ajp_common.c 30 Oct 2002 21:17:34 -0000 1.31 @@ -623,7 +623,7 @@ } } - jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::ajp_connect_to_endpoint, failed errno = %d\n", errno); + jk_log(l, JK_LOG_ERROR, "ERROR connecting to tomcat. Tomcat is probably not started. Failed errno = %d\n", errno); return JK_FALSE; } @@ -676,7 +676,7 @@ rc = jk_tcp_socket_recvfull(ae->sd, head, AJP_HEADER_LEN); if(rc < 0) { - jk_log(l, JK_LOG_ERROR, "ajp_connection_tcp_get_message: Error - jk_tcp_socket_recvfull failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR: can't receive the response message from tomcat, network problems or tomcat is down.\n"); return JK_FALSE; } @@ -719,7 +719,7 @@ rc = jk_tcp_socket_recvfull(ae->sd, jk_b_get_buff(msg), msglen); if(rc < 0) { - jk_log(l, JK_LOG_ERROR, "ajp_connection_tcp_get_message: Error - jk_tcp_socket_recvfull failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR: can't receive the response message from tomcat, network problems or tomcat is down\n"); return JK_FALSE; } @@ -801,7 +801,7 @@ } if ((len = ajp_read_fully_from_server(r, read_buf, len)) < 0) { - jk_log(l, JK_LOG_ERROR, "ajp_read_into_msg_buff: Error - ajp_read_fully_from_server failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR: receiving data from server failed, the client aborted the connection or network errors.\n"); return -1; } @@ -849,7 +849,7 @@ * First try to reuse open connections... */ while ((ae->sd > 0) && ! ajp_connection_tcp_send_message(ae, op->request, l)) { - jk_log(l, JK_LOG_ERROR, "Error sending request try another pooled connection\n"); + jk_log(l, JK_LOG_INFO, "Error sending request try another pooled connection\n"); jk_close_socket(ae->sd); ae->sd = -1; ajp_reuse_connection(ae, l); @@ -865,7 +865,7 @@ * have is probably unrecoverable */ if (!ajp_connection_tcp_send_message(ae, op->request, l)) { - jk_log(l, JK_LOG_ERROR, "Error sending request on a fresh connection\n"); + jk_log(l, JK_LOG_INFO, "Error sending request on a fresh connection\n"); return JK_FALSE; } } else { @@ -958,7 +958,7 @@ { unsigned len = (unsigned)jk_b_get_int(msg); if(!r->write(r, jk_b_get_buff(msg) + jk_b_get_pos(msg), len)) { - jk_log(l, JK_LOG_ERROR, "Error ajp_process_callback - write failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR sending data to client. Connection aborted or network problems\n"); return JK_CLIENT_ERROR; } } @@ -984,7 +984,7 @@ return JK_AJP13_HAS_RESPONSE; } - jk_log(l, JK_LOG_ERROR, "Error ajp_process_callback - ajp_read_into_msg_buff failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR reading POST data from client. Connection aborted or network problems\n"); return JK_INTERNAL_ERROR; } break; @@ -1038,7 +1038,7 @@ int rc = 0; if(!ajp_connection_tcp_get_message(p, op->reply, l)) { - jk_log(l, JK_LOG_ERROR, "Error reading reply\n"); + jk_log(l, JK_LOG_ERROR, "Error reading reply from tomcat. Tomcat is down or network problems.\n"); /* we just can't recover, unset recover flag */ return JK_FALSE; } @@ -1061,7 +1061,7 @@ op->recoverable = JK_FALSE; rc = ajp_connection_tcp_send_message(p, op->post, l); if (rc < 0) { - jk_log(l, JK_LOG_ERROR, "Error sending request data %d\n", rc); + jk_log(l, JK_LOG_ERROR, "Error sending request data %d. Tomcat is down or network problems.\n", rc); return JK_FALSE; } } else if(JK_FATAL_ERROR == rc) { @@ -1154,7 +1154,7 @@ */ if (! op->recoverable) { *is_recoverable_error = JK_FALSE; - jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::service, ajp_send_request failed without recovery in send loop %d\n", i); + jk_log(l, JK_LOG_ERROR, "ERROR: sending request to tomcat failed without recovery in send loop %d\n", i); return JK_FALSE; } @@ -1171,14 +1171,14 @@ */ if (! op->recoverable) { *is_recoverable_error = JK_FALSE; - jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::service, ajp_get_reply failed without recovery in send loop %d\n", i); + jk_log(l, JK_LOG_ERROR, "ERROR: receiving reply from tomcat failed without recovery in send loop %d\n", i); return JK_FALSE; } - jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::service, ajp_get_reply failed in send loop %d\n", i); + jk_log(l, JK_LOG_ERROR, "ERRORO: Receiving from tomcat failed, recoverable operation. err=%d\n", i); } else - jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::service, ajp_send_request failed in send loop %d\n", i); + jk_log(l, JK_LOG_ERROR, "ERROR: sending request to tomcat failed in send loop. err=%d\n", i); jk_close_socket(p->sd); p->sd = -1; @@ -1229,9 +1229,9 @@ if(jk_resolve(host, (short)port, &p->worker_inet_addr)) { return JK_TRUE; } - jk_log(l, JK_LOG_ERROR, "In jk_worker_t::validate, resolve failed\n"); + jk_log(l, JK_LOG_ERROR, "ERROR: can't resolve tomcat address %s\n", host); } - jk_log(l, JK_LOG_ERROR, "In jk_worker_t::validate, Error %s %d\n", host, port); + jk_log(l, JK_LOG_ERROR, "ERROR: invalid host and port %s %d\n", (( host==NULL ) ? "NULL" : host ), port); } else { jk_log(l, JK_LOG_ERROR, "In jk_worker_t::validate, NULL parameters\n"); } 1.11 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_lb_worker.c 15 May 2002 21:00:29 -0000 1.10 +++ jk_lb_worker.c 30 Oct 2002 21:17:34 -0000 1.11 @@ -358,7 +358,7 @@ * Error is not recoverable - break with an error. */ jk_log(l, JK_LOG_ERROR, - "In jk_endpoint_t::service, none recoverable error...\n"); + "lb: unrecoverable error, request failed. Tomcat failed in the middle of request, we can't recover to another instance.\n"); break; } @@ -371,7 +371,7 @@ } else { /* NULL record, no more workers left ... */ jk_log(l, JK_LOG_ERROR, - "In jk_endpoint_t::service, No more workers left, can not submit the request\n"); + "lb: All tomcat instances failed, no more workers left.\n"); break; } } -- To unsubscribe, e-mail: For additional commands, e-mail: