From 329e513be664876550d9bbdc17943adb723eebc6 Mon Sep 17 00:00:00 2001 From: Scott Deboy Date: Thu, 21 Feb 2013 05:29:20 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/logging/chainsaw/trunk@1448515 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/log4j/varia/LogFilePatternReceiver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java index 4430205c..c4fb451a 100644 --- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java +++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java @@ -157,7 +157,8 @@ public class LogFilePatternReceiver extends Receiver { 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 = "[ ]+";