From c6e77f6fa462e292db5f693a33e7c483b5a6e19e Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 16 Apr 2021 23:59:02 +0000
Subject: [PATCH] Release 0.5 started: SpringBoot instead of Jetty, Jersey etc.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/logging/LoggingEventData.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/logging/LoggingEventData.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/logging/LoggingEventData.java
index 2c39631..f00c60c 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/logging/LoggingEventData.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/logging/LoggingEventData.java
@@ -1,8 +1,10 @@
package de.micromata.borgbutler.server.logging;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.ThrowableProxyUtil;
+import ch.qos.logback.core.CoreConstants;
import org.apache.commons.lang3.ClassUtils;
-import org.apache.log4j.spi.LocationInfo;
-import org.apache.log4j.spi.LoggingEvent;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -23,26 +25,26 @@
private String logDate;
String javaClass;
private String javaClassSimpleName;
- private String lineNumber;
+ private int lineNumber;
private String methodName;
private String stackTrace;
LoggingEventData() {
-
}
- public LoggingEventData(LoggingEvent event) {
+ public LoggingEventData(ILoggingEvent event) {
level = LogLevel.getLevel(event);
- message = event.getRenderedMessage();
+ message = event.getFormattedMessage();
messageObjectClass = event.getMessage().getClass().toString();
loggerName = event.getLoggerName();
- logDate = getIsoLogDate(event.timeStamp);
- LocationInfo info = event.getLocationInformation();
- Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation().getThrowable() : null;
- if (throwable != null) {
+ logDate = getIsoLogDate(event.getTimeStamp());
+ StackTraceElement info = event.getCallerData()[0];
+ IThrowableProxy throwableProxy = event.getThrowableProxy();
+ if (throwableProxy != null) {
StringWriter writer = new StringWriter();
PrintWriter printWriter = new PrintWriter(writer);
- throwable.printStackTrace(printWriter);
+ printWriter.append(ThrowableProxyUtil.asString(throwableProxy));
+ printWriter.append(CoreConstants.LINE_SEPARATOR);
stackTrace = writer.toString();
}
if (info != null) {
@@ -81,7 +83,7 @@
return javaClassSimpleName;
}
- public String getLineNumber() {
+ public int getLineNumber() {
return lineNumber;
}
--
Gitblit v1.10.0