Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 91422 invoked from network); 25 Feb 2004 07:53:24 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 25 Feb 2004 07:53:24 -0000 Received: (qmail 87800 invoked by uid 500); 25 Feb 2004 07:52:58 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 87755 invoked by uid 500); 25 Feb 2004 07:52:58 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 87740 invoked from network); 25 Feb 2004 07:52:58 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 25 Feb 2004 07:52:58 -0000 Received: (qmail 91337 invoked by uid 1711); 25 Feb 2004 07:53:20 -0000 Date: 25 Feb 2004 07:53:20 -0000 Message-ID: <20040225075320.91336.qmail@minotaur.apache.org> From: dain@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender ConsoleAppenderService.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dain 2004/02/24 23:53:20 Modified: modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender ConsoleAppenderService.java Log: Changed console appender to wrap any console appender already registered witht the root log or it will create a new one Revision Changes Path 1.2 +29 -2 incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java Index: ConsoleAppenderService.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ConsoleAppenderService.java 12 Feb 2004 18:12:52 -0000 1.1 +++ ConsoleAppenderService.java 25 Feb 2004 07:53:20 -0000 1.2 @@ -56,10 +56,14 @@ package org.apache.geronimo.system.logging.log4j.appender; +import java.util.Enumeration; + import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoFactory; import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.Logger; +import org.apache.log4j.Appender; /** * An extention of the default Log4j DailyRollingFileAppender @@ -69,7 +73,30 @@ */ public class ConsoleAppenderService extends AbstractAppenderService { public ConsoleAppenderService() { - super(new ConsoleAppender()); + super(getConsoleAppender()); + } + + private static ConsoleAppender getConsoleAppender() { + Logger root = Logger.getRootLogger(); + for(Enumeration enum = root.getAllAppenders(); enum.hasMoreElements();) { + Appender appender = (Appender)enum.nextElement(); + if (appender instanceof ConsoleAppender) { + return (ConsoleAppender)appender; + } + } + return new ConsoleAppender(); + } + + public void doStart() { + appender.activateOptions(); + Logger root = Logger.getRootLogger(); + root.addAppender(appender); + } + + public void doStop() { + } + + public void doFail() { } public String getTarget() {