Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 77106 invoked from network); 21 Mar 2003 13:40:54 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 21 Mar 2003 13:40:54 -0000 Received: (qmail 11509 invoked by uid 97); 21 Mar 2003 13:42:40 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 11502 invoked from network); 21 Mar 2003 13:42:40 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 21 Mar 2003 13:42:40 -0000 Received: (qmail 75189 invoked by uid 500); 21 Mar 2003 13:40:33 -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 75132 invoked from network); 21 Mar 2003 13:40:33 -0000 Received: from ms-smtp-02.southeast.rr.com (24.93.67.83) by daedalus.apache.org with SMTP; 21 Mar 2003 13:40:33 -0000 Received: from mail3.nc.rr.com (fe3 [24.93.67.50]) by ms-smtp-02.southeast.rr.com (8.12.5/8.12.2) with ESMTP id h2LDcige015852 for ; Fri, 21 Mar 2003 08:38:50 -0500 (EST) Received: from attglobal.net ([66.57.69.69]) by mail3.nc.rr.com with Microsoft SMTPSVC(5.5.1877.757.75); Fri, 21 Mar 2003 08:38:15 -0500 Message-ID: <3E7B167E.1010202@attglobal.net> Date: Fri, 21 Mar 2003 08:41:18 -0500 From: Jeff Trawick Reply-To: trawick@attglobal.net User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.3) Gecko/20030312 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: [Fwd: [PATCH] fix syntax error in mod_jk2 file jk_channel_apr_socket.c] References: <3E7B0659.3080803@attglobal.net> <3E7B0AE9.9000909@apache.org> In-Reply-To: <3E7B0AE9.9000909@apache.org> Content-Type: multipart/mixed; boundary="------------040608020709050104000702" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --------------040608020709050104000702 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Henri Gomez wrote: > Better rewrite it like : > > if (remote_sa->next) > env->l->jkLog(env, > env->l, > JK_LOG_DEBUG, > "channelApr.open(): error %d creating socket %d %s\n", > ret, > socketInfo->host); > else > env->l->jkLog(env, > env->l, > JK_LOG_ERROR, > "channelApr.open(): error %d creating socket %d %s\n", > ret, > socketInfo->host); Such a patch is attached. Thanks for your response, Jeff --------------040608020709050104000702 Content-Type: text/plain; name="mod_jk2_patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mod_jk2_patch" Index: common/jk_channel_apr_socket.c =================================================================== RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v retrieving revision 1.29 diff -u -r1.29 jk_channel_apr_socket.c --- common/jk_channel_apr_socket.c 4 Feb 2003 07:39:59 -0000 1.29 +++ common/jk_channel_apr_socket.c 21 Mar 2003 13:38:14 -0000 @@ -226,9 +226,16 @@ if ((ret = apr_socket_create(&sock, remote_sa->family, SOCK_STREAM, (apr_pool_t *)env->globalPool->_private)) != APR_SUCCESS) { - env->l->jkLog(env, env->l, remote_sa->next ? JK_LOG_DEBUG : JK_LOG_ERROR, - "channelApr.open(): error %d creating socket %d %s\n", - ret, socketInfo->host); + if (remote_sa->next) { + env->l->jkLog(env, env->l, JK_LOG_DEBUG, + "channelApr.open(): error %d creating socket %d %s\n", + ret, socketInfo->host); + } + else { + env->l->jkLog(env, env->l, JK_LOG_ERROR, + "channelApr.open(): error %d creating socket %d %s\n", + ret, socketInfo->host); + } remote_sa = remote_sa->next; continue; } @@ -255,11 +262,20 @@ /* if an error occurred, loop round and try again */ if (ret != APR_SUCCESS) { apr_socket_close(sock); - env->l->jkLog(env, env->l, remote_sa->next ? JK_LOG_DEBUG : JK_LOG_ERROR, - "channelApr.open() attempt to connect to %pI (%s) failed %d\n", - remote_sa, - socketInfo->host, - ret); + if (remote_sa->next) { + env->l->jkLog(env, env->l, JK_LOG_DEBUG, + "channelApr.open() attempt to connect to %pI (%s) failed %d\n", + remote_sa, + socketInfo->host, + ret); + } + else { + env->l->jkLog(env, env->l, JK_LOG_ERROR, + "channelApr.open() attempt to connect to %pI (%s) failed %d\n", + remote_sa, + socketInfo->host, + ret); + } remote_sa = remote_sa->next; continue; } --------------040608020709050104000702 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org --------------040608020709050104000702--