From dev-return-74344-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Sun Sep 03 18:01:09 2006 Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 11670 invoked from network); 3 Sep 2006 18:01:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Sep 2006 18:01:09 -0000 Received: (qmail 96921 invoked by uid 500); 3 Sep 2006 18:01:05 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 96874 invoked by uid 500); 3 Sep 2006 18:01:05 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 96863 invoked by uid 500); 3 Sep 2006 18:01:05 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 96860 invoked by uid 99); 3 Sep 2006 18:01:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Sep 2006 11:01:05 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Sep 2006 11:01:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 041901A981A; Sun, 3 Sep 2006 11:00:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439813 - /tomcat/connectors/trunk/jk/native/common/jk_status.c Date: Sun, 03 Sep 2006 18:00:44 -0000 To: tomcat-dev@jakarta.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060903180045.041901A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rjung Date: Sun Sep 3 11:00:44 2006 New Revision: 439813 URL: http://svn.apache.org/viewvc?view=rev&rev=439813 Log: Adjust recover time output with respect to next global maintenance. Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=439813&r1=439812&r2=439813 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_status.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Sep 3 11:00:44 2006 @@ -473,24 +473,25 @@ jk_putv(s, "", status_strfsize(wr->s->readed, buf), "", NULL); jk_printf(s, "%u", wr->s->busy); - jk_printf(s, "%u", wr->s->max_busy); + jk_printf(s, "%u\n", wr->s->max_busy); if (wr->s->redirect && *wr->s->redirect) jk_puts(s, wr->s->redirect); else jk_puts(s," "); - jk_puts(s, "\n"); + jk_puts(s, "\n"); if (wr->s->domain && *wr->s->domain) jk_puts(s, wr->s->domain); else jk_puts(s," "); + jk_puts(s, "\n"); if (wr->s->state == JK_LB_STATE_ERROR) { - int rs = lb->s->recover_wait_time - (int)difftime(now, wr->s->error_time); - jk_printf(s, "\n%u", rs < 0 ? 0 : rs); + int rs = lb->maintain_time - (int)difftime(now, lb->s->last_maintain_time); + if (rs < lb->s->recover_wait_time - (int)difftime(now, wr->s->error_time)) + rs += lb->maintain_time; + jk_printf(s, "%u", rs < 0 ? 0 : rs); } else - jk_puts(s, "\n"); - - + jk_puts(s, "-"); jk_puts(s, "\n\n"); } jk_puts(s, "
\n"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org