Repository: tomee Updated Branches: refs/heads/master 479c69f0d -> 095ce2560
TOMEE-1991 adding class and method as unitary entry for PatternFormatter Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/095ce256 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/095ce256 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/095ce256 Branch: refs/heads/master Commit: 095ce2560ceba8ad63b3a87afc2a73867ff4df27 Parents: 479c69f Author: rmannibucau <[email protected]> Authored: Mon Jan 2 21:52:07 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Mon Jan 2 21:52:07 2017 +0100 ---------------------------------------------------------------------- .../tomee/jul/handler/rotating/LocalFileHandler.java | 14 +++++++++----- .../LocalFileHandlerPatternFormatterTest.java | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/095ce256/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java index fcb557c..c7d5e99 100644 --- a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java +++ b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java @@ -634,10 +634,12 @@ public class LocalFileHandler extends Handler { date.setTime(record.getMillis()); String source; - if (record.getSourceClassName() != null) { - source = record.getSourceClassName(); - if (record.getSourceMethodName() != null) { - source += " " + record.getSourceMethodName(); + final String sourceClassName = record.getSourceClassName(); + final String sourceMethodName = record.getSourceMethodName(); + if (sourceClassName != null) { + source = sourceClassName; + if (sourceMethodName != null) { + source += " " + sourceMethodName; } } else { source = record.getLoggerName(); @@ -661,7 +663,9 @@ public class LocalFileHandler extends Handler { date, source, record.getLoggerName(), Locale.ENGLISH == locale ? record.getLevel().getName() : record.getLevel().getLocalizedName(), - message, throwable); + message, throwable, + sourceClassName == null ? source : sourceClassName, + sourceMethodName == null ? source : sourceMethodName); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/095ce256/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java index a5f7e4f..15ca282 100644 --- a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java +++ b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java @@ -44,5 +44,10 @@ public class LocalFileHandlerPatternFormatterTest { assertEquals( "test message\n", new LocalFileHandler.PatternFormatter("%5$s%n", Locale.ENGLISH).format(record).replace("\r", "")); + + // simple + assertEquals("1970-17-02 11:17:36 [FINER][my.class.Name] test message\n", + new LocalFileHandler.PatternFormatter( + "%1$tY-%1$tM-%1$td %1$tT [%4$5s][%7$s] %5$s%6$s%n", Locale.ENGLISH).format(record).replace("\r", "")); } }
