You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/03/21 11:43:12 UTC
karaf-decanter git commit: [KARAF-3626] Add location information
Repository: karaf-decanter
Updated Branches:
refs/heads/master e3df90b05 -> 646eaf29b
[KARAF-3626] Add location information
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/646eaf29
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/646eaf29
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/646eaf29
Branch: refs/heads/master
Commit: 646eaf29bca7c02f23768434bd848085fe911505
Parents: e3df90b
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Sat Mar 21 11:42:52 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Sat Mar 21 11:42:52 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/decanter/collector/log/LogAppender.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/646eaf29/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
----------------------------------------------------------------------
diff --git a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
index 0f39277..b1235a9 100644
--- a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
+++ b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.log4j.MDC;
import org.ops4j.pax.logging.spi.PaxAppender;
+import org.ops4j.pax.logging.spi.PaxLocationInfo;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -68,7 +69,7 @@ public class LogAppender implements PaxAppender {
data.put("level", event.getLevel().toString());
data.put("renderedMessage", event.getRenderedMessage());
data.put("MDC", event.getProperties());
-
+ putLocation(data, event.getLocationInformation());
String[] throwableAr = event.getThrowableStrRep();
if (throwableAr != null) {
data.put("throwable", join(throwableAr));
@@ -80,6 +81,13 @@ public class LogAppender implements PaxAppender {
}
}
+ private void putLocation(Map<String, Object> data, PaxLocationInfo loc) {
+ data.put("loc.class", loc.getClassName());
+ data.put("loc.file", loc.getFileName());
+ data.put("loc.line", loc.getLineNumber());
+ data.put("loc.method", loc.getMethodName());
+ }
+
private Object join(String[] throwableAr) {
StringBuilder builder = new StringBuilder();
for (String line : throwableAr) {