Return-Path: Delivered-To: apmail-logging-general-archive@www.apache.org Received: (qmail 81059 invoked from network); 16 Aug 2010 06:16:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Aug 2010 06:16:00 -0000 Received: (qmail 73937 invoked by uid 500); 16 Aug 2010 06:16:00 -0000 Delivered-To: apmail-logging-general-archive@logging.apache.org Received: (qmail 73794 invoked by uid 500); 16 Aug 2010 06:15:57 -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 73776 invoked by uid 99); 16 Aug 2010 06:15:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Aug 2010 06:15:56 +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; Mon, 16 Aug 2010 06:15:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 86AEF238890D; Mon, 16 Aug 2010 06:14:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r985797 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: LogUI.java receivers/PluginPropertyEditorPanel.java vfs/VFSLogFilePatternReceiver.java Date: Mon, 16 Aug 2010 06:14:38 -0000 To: general@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100816061438.86AEF238890D@eris.apache.org> Author: sdeboy Date: Mon Aug 16 06:14:38 2010 New Revision: 985797 URL: http://svn.apache.org/viewvc?rev=985797&view=rev Log: Minor bug fixes - Fixed bug preventing non-blank receiver properties from being set to blank (except for 'name' field) - Now only logging in VFS receiver panel if the file size grows or the file is truncated (not every time the file is examined for changes) - Fixed bug causing a specified receiver configuration to be loaded twice if loaded from the receiver configuration/selection screen - Updated LogFilePatternReceiver timestamp regexp support to escape dots in timestamps Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java 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=985797&r1=985796&r2=985797&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 Mon Aug 16 06:14:38 2010 @@ -1541,9 +1541,9 @@ public class LogUI extends JFrame implem public void run() { if (receiverConfigurationPanel.isDontWarnMeAgain()) { applicationPreferenceModel.setConfigurationURL(finalURL.toExternalForm()); + } else { + loadConfigurationUsingPluginClassLoader(finalURL); } - loadConfigurationUsingPluginClassLoader(finalURL); - receiversPanel.updateReceiverTreeInDispatchThread(); } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java?rev=985797&r1=985796&r2=985797&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java Mon Aug 16 06:14:38 2010 @@ -349,7 +349,8 @@ public class PluginPropertyEditorPanel e if (columnIndex == 1) { - if (descriptors[rowIndex].getName().toLowerCase().equals("name") && aValue == null || aValue.toString().trim().equals("")) { + //ensure name is set + if (descriptors[rowIndex].getName().toLowerCase().equals("name") && (aValue == null || aValue.toString().trim().equals(""))) { logger.error("Name required"); return; } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java?rev=985797&r1=985796&r2=985797&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java Mon Aug 16 06:14:38 2010 @@ -399,6 +399,7 @@ public class VFSLogFilePatternReceiver e fileObject = fileSystemManager.resolveFile(getFileURL(), opts); //file may not exist.. + boolean fileLarger = false; if (fileObject != null && fileObject.exists()) { try { //available in vfs as of 30 Mar 2006 - will load but not tail if not available @@ -406,9 +407,6 @@ public class VFSLogFilePatternReceiver e } catch (Error err) { getLogger().info(getPath() + " - unable to refresh fileobject", err); } - if (lastFileSize == 0) { - getLogger().info(getPath() + " - loading file"); - } //could have been truncated or appended to (don't do anything if same size) if (fileObject.getContent().getSize() < lastFileSize) { reader = new InputStreamReader(fileObject.getContent().getInputStream()); @@ -416,6 +414,7 @@ public class VFSLogFilePatternReceiver e lastFileSize = 0; //seek to beginning of file lastFilePointer = 0; } else if (fileObject.getContent().getSize() > lastFileSize) { + fileLarger = true; RandomAccessContent rac = fileObject.getContent().getRandomAccessContent(RandomAccessMode.READ); rac.seek(lastFilePointer); reader = new InputStreamReader(rac.getInputStream()); @@ -451,7 +450,7 @@ public class VFSLogFilePatternReceiver e wait(getWaitMillis()); } } catch (InterruptedException ie) {} - if (isTailing() && !terminated) { + if (isTailing() && fileLarger && !terminated) { getLogger().debug(getPath() + " - tailing file - file size: " + lastFileSize); } } while (isTailing() && !terminated);