From general-return-1050-apmail-logging-general-archive=logging.apache.org@logging.apache.org Thu Aug 23 05:17:57 2007 Return-Path: Delivered-To: apmail-logging-general-archive@www.apache.org Received: (qmail 97551 invoked from network); 23 Aug 2007 05:17:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Aug 2007 05:17:55 -0000 Received: (qmail 15141 invoked by uid 500); 23 Aug 2007 05:17:52 -0000 Delivered-To: apmail-logging-general-archive@logging.apache.org Received: (qmail 15088 invoked by uid 500); 23 Aug 2007 05:17:52 -0000 Mailing-List: contact general-help@logging.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Logging General" List-Id: Delivered-To: mailing list general@logging.apache.org Received: (qmail 15077 invoked by uid 99); 23 Aug 2007 05:17:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2007 22:17:51 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2007 05:17:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1547D1A981A; Wed, 22 Aug 2007 22:17:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568823 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: ChainsawAppenderHandler.java LogUI.java Date: Thu, 23 Aug 2007 05:17:33 -0000 To: general@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070823051734.1547D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sdeboy Date: Wed Aug 22 22:17:32 2007 New Revision: 568823 URL: http://svn.apache.org/viewvc?rev=568823&view=rev Log: - Use MDC entries to send chainsaw-generated logging events to a chainsaw-log tab by default. - Clearing the same MDC entries in ChainsawAppenderHandler in order to prevent receiver-initiated events from routing to the chainsaw-log tab Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java?rev=568823&r1=568822&r2=568823&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java Wed Aug 22 22:17:32 2007 @@ -26,6 +26,7 @@ import javax.swing.event.EventListenerList; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.LogManager; +import org.apache.log4j.MDC; import org.apache.log4j.helpers.Constants; import org.apache.log4j.net.SocketReceiver; import org.apache.log4j.rule.ExpressionRule; @@ -221,6 +222,10 @@ protected WorkQueue() { workerThread = new WorkerThread(); + //clear the chainsaw-log mdc entries which is used to send Chainsaw-generated + //logging events to a special chainsaw-log tab + MDC.remove(Constants.HOSTNAME_KEY); + MDC.remove(Constants.APPLICATION_KEY); workerThread.start(); } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java?rev=568823&r1=568822&r2=568823&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java Wed Aug 22 22:17:32 2007 @@ -88,6 +88,7 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.LoggerRepositoryExImpl; +import org.apache.log4j.MDC; import org.apache.log4j.chainsaw.dnd.FileDnDTarget; import org.apache.log4j.chainsaw.help.HelpManager; import org.apache.log4j.chainsaw.help.Tutorial; @@ -263,7 +264,11 @@ return repositoryExImpl; }}, repositorySelectorGuard); - + //set hostname & application properties which will cause Chainsaw-generated + //logging events to route (by default) to a tab named 'chainsaw-log' + MDC.put(Constants.HOSTNAME_KEY, "chainsaw"); + MDC.put(Constants.APPLICATION_KEY, "log"); + ApplicationPreferenceModel model = new ApplicationPreferenceModel(); SettingsManager.getInstance().configure(new ApplicationPreferenceModelSaver(model));