Repository: karaf Updated Branches: refs/heads/master d3c90b7e0 -> af9b835e7
KARAF-5124 Fix location logging in Karaf console Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/af9b835e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/af9b835e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/af9b835e Branch: refs/heads/master Commit: af9b835e7ec5585672dd98433ffe3591c371954b Parents: d3c90b7 Author: clockard <[email protected]> Authored: Mon May 15 14:47:21 2017 -0700 Committer: clockard <[email protected]> Committed: Mon May 15 16:16:06 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/karaf/log/core/internal/KarafLogEvent.java | 3 ++- .../apache/karaf/log/core/internal/layout/PatternParser.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/af9b835e/log/src/main/java/org/apache/karaf/log/core/internal/KarafLogEvent.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/KarafLogEvent.java b/log/src/main/java/org/apache/karaf/log/core/internal/KarafLogEvent.java index 4cfd742..b81b281 100644 --- a/log/src/main/java/org/apache/karaf/log/core/internal/KarafLogEvent.java +++ b/log/src/main/java/org/apache/karaf/log/core/internal/KarafLogEvent.java @@ -46,6 +46,7 @@ public class KarafLogEvent implements PaxLoggingEvent { this.timeStamp = event.getTimeStamp(); this.fQNOfLoggerClass = event.getFQNOfLoggerClass(); this.properties = new HashMap(event.getProperties()); + this.locationInformation = event.getLocationInformation(); } @Override @@ -86,7 +87,7 @@ public class KarafLogEvent implements PaxLoggingEvent { @Override public boolean locationInformationExists() { - return false; + return this.locationInformation != null; } @Override http://git-wip-us.apache.org/repos/asf/karaf/blob/af9b835e/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java ---------------------------------------------------------------------- diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java index 5e26d13..61f7343 100644 --- a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java +++ b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java @@ -451,6 +451,9 @@ public class PatternParser { public String convert(PaxLoggingEvent event) { + if(!event.locationInformationExists()){ + return "?"; + } PaxLocationInfo locationInfo = event.getLocationInformation(); switch(type) { /*case FULL_LOCATION_CONVERTER: @@ -508,6 +511,9 @@ public class PatternParser { } String getFullyQualifiedName(PaxLoggingEvent event) { + if(!event.locationInformationExists()){ + return "?"; + } return event.getLocationInformation().getClassName(); } }
