Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 15463 invoked from network); 6 Jun 2010 23:43:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Jun 2010 23:43:44 -0000 Received: (qmail 72722 invoked by uid 500); 6 Jun 2010 23:43:43 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 72655 invoked by uid 500); 6 Jun 2010 23:43:43 -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 72646 invoked by uid 99); 6 Jun 2010 23:43:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jun 2010 23:43:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jun 2010 23:43:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 71FD32388980; Sun, 6 Jun 2010 23:43:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r952022 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/authenticator/ java/org/apache/catalina/ha/session/ webapps/docs/ Date: Sun, 06 Jun 2010 23:43:18 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100606234318.71FD32388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jun 6 23:43:17 2010 New Revision: 952022 URL: http://svn.apache.org/viewvc?rev=952022&view=rev Log: Fix missing message text and logging with unexpected logger issues in cluster listeners Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=952022&r1=952021&r2=952022&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:43:17 2010 @@ -135,12 +135,6 @@ PATCHES PROPOSED TO BACKPORT: +1: rjung, markt, kkolinko -1: -* Fix missing message text and logging with unexpected logger issues in cluster - listeners - http://people.apache.org/~markt/patches/2010-05-19-lost-messages.patch - +1: markt, rjung, kkolinko - -1: - * Fix ByteChunk.indexOf(String, ...) when the string is of length 1 http://svn.apache.org/viewvc?rev=945231&view=rev +1: kkolinko, markt, rjung Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=952022&r1=952021&r2=952022&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java Sun Jun 6 23:43:17 2010 @@ -24,6 +24,8 @@ import org.apache.catalina.Session; import org.apache.catalina.ha.ClusterManager; import org.apache.catalina.ha.ClusterMessage; import org.apache.catalina.ha.ClusterListener; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Receive replicated SingleSignOnMessage form other cluster node. @@ -32,6 +34,9 @@ import org.apache.catalina.ha.ClusterLis */ public class ClusterSingleSignOnListener extends ClusterListener { + private static final Log log = + LogFactory.getLog(ClusterSingleSignOnListener.class); + /** * The descriptive information about this implementation. */ Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=952022&r1=952021&r2=952022&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Sun Jun 6 23:43:17 2010 @@ -19,9 +19,11 @@ package org.apache.catalina.ha.session; import java.util.Map; +import org.apache.catalina.ha.ClusterListener; import org.apache.catalina.ha.ClusterManager; import org.apache.catalina.ha.ClusterMessage; -import org.apache.catalina.ha.*; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Receive replicated SessionMessage form other cluster node. @@ -30,7 +32,10 @@ import org.apache.catalina.ha.*; * @version $Id$ */ public class ClusterSessionListener extends ClusterListener { - + + private static final Log log = + LogFactory.getLog(ClusterSessionListener.class); + /** * The descriptive information about this implementation. */ Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=952022&r1=952021&r2=952022&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java Sun Jun 6 23:43:17 2010 @@ -24,9 +24,12 @@ import org.apache.catalina.Context; import org.apache.catalina.Engine; import org.apache.catalina.LifecycleException; import org.apache.catalina.Session; +import org.apache.catalina.ha.ClusterListener; import org.apache.catalina.ha.ClusterMessage; import org.apache.catalina.core.StandardEngine; -import org.apache.catalina.ha.*; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.util.res.StringManager; /** * Receive SessionID cluster change from other backup node after primary session @@ -37,6 +40,12 @@ import org.apache.catalina.ha.*; */ public class JvmRouteSessionIDBinderListener extends ClusterListener { + private static final Log log = + LogFactory.getLog(JvmRouteSessionIDBinderListener.class); + + private static final StringManager sm = + StringManager.getManager(Constants.Package); + /** * The descriptive information about this implementation. */ Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=952022&r1=952021&r2=952022&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 6 23:43:17 2010 @@ -228,6 +228,10 @@ 49170: Do not send duplicated session. (kfujino) + + Add missing messages and ensure cluster listeners log messages to + correct logger. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org