Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9CFDF9881 for ; Thu, 21 Feb 2013 05:29:49 +0000 (UTC) Received: (qmail 43425 invoked by uid 500); 21 Feb 2013 05:29:49 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 43341 invoked by uid 500); 21 Feb 2013 05:29:45 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 43275 invoked by uid 99); 21 Feb 2013 05:29:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2013 05:29:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 21 Feb 2013 05:29:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4074238890B; Thu, 21 Feb 2013 05:29:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1448515 - /logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java Date: Thu, 21 Feb 2013 05:29:20 -0000 To: commits@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130221052920.C4074238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sdeboy Date: Thu Feb 21 05:29:20 2013 New Revision: 1448515 URL: http://svn.apache.org/r1448515 Log: Remove optional leading and trailing spaces around LEVEL and LOGGER definitions Supports parsing of log entries where the start of the entry is a right-aligned level Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java?rev=1448515&r1=1448514&r2=1448515&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java Thu Feb 21 05:29:20 2013 @@ -157,7 +157,8 @@ public class LogFilePatternReceiver exte private static final String REGEXP_DEFAULT_WILDCARD = ".*?"; private static final String REGEXP_GREEDY_WILDCARD = ".*"; private static final String PATTERN_WILDCARD = "*"; - private static final String NOSPACE_GROUP = "(\\S*\\s*?)"; + //pull in optional leading and trailing spaces + private static final String NOSPACE_GROUP = "(\\s*?\\S*?\\s*?)"; private static final String DEFAULT_GROUP = "(" + REGEXP_DEFAULT_WILDCARD + ")"; private static final String GREEDY_GROUP = "(" + REGEXP_GREEDY_WILDCARD + ")"; private static final String MULTIPLE_SPACES_REGEXP = "[ ]+";