You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/05/30 23:49:19 UTC

[42/50] [abbrv] logging-chainsaw git commit: Remove optional leading and trailing spaces around LEVEL and LOGGER definitions

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


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/e55aeec4
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/e55aeec4
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/e55aeec4

Branch: refs/heads/master
Commit: e55aeec49804cd61ff8e490ab2db0b141e0b8f84
Parents: ef6872d
Author: Scott Deboy <sd...@apache.org>
Authored: Thu Feb 21 05:29:20 2013 +0000
Committer: Scott Deboy <sd...@apache.org>
Committed: Thu Feb 21 05:29:20 2013 +0000

----------------------------------------------------------------------
 src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e55aeec4/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index 4430205..c4fb451 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 = "[ ]+";