From 72e68d070295917eb0b757173e1974263839f8d9 Mon Sep 17 00:00:00 2001
From: Tucker Siegel <tgsiegel@terpmail.umd.edu>
Date: Sun, 26 Mar 2023 17:30:10 -0400
Subject: [PATCH] logging-update
---
.../edu/umd/dawn/common/exceptions/CustomExceptionHandler.java | 3 +++
src/main/java/edu/umd/dawn/common/logging/ServiceLog.java | 2 ++
2 files changed, 5 insertions(+)
diff --git a/src/main/java/edu/umd/dawn/common/exceptions/CustomExceptionHandler.java b/src/main/java/edu/umd/dawn/common/exceptions/CustomExceptionHandler.java
index 447294b..843e7a4 100644
--- a/src/main/java/edu/umd/dawn/common/exceptions/CustomExceptionHandler.java
+++ b/src/main/java/edu/umd/dawn/common/exceptions/CustomExceptionHandler.java
@@ -32,8 +32,11 @@ public class CustomExceptionHandler {
private ResponseEntity<Object> returnDawnException(DawnException exception) {
if (exception.getBase() != null) {
MDC.put("stackTrace", getStackTrace(exception.getBase()));
+ MDC.put("exceptionMessage", exception.getBase().getMessage());
} else {
MDC.put("stackTrace", getStackTrace(exception));
+ MDC.put("exceptionMessage", exception.getMessage());
+ // MDC.put("exceptionMessage", exception.)
}
log.error(exception.getMessage());
MDC.remove("stackTrace");
diff --git a/src/main/java/edu/umd/dawn/common/logging/ServiceLog.java b/src/main/java/edu/umd/dawn/common/logging/ServiceLog.java
index 741a35b..3156cfc 100644
--- a/src/main/java/edu/umd/dawn/common/logging/ServiceLog.java
+++ b/src/main/java/edu/umd/dawn/common/logging/ServiceLog.java
@@ -23,6 +23,7 @@ public class ServiceLog extends Log {
private String message;
private String stackTrace;
+ private String exceptionMessage;
private String origin;
public static ServiceLog fromLogEvent(LogEvent event) {
@@ -30,6 +31,7 @@ public class ServiceLog extends Log {
.level(event.getLevel().name())
.message(event.getMessage().toString())
.stackTrace(event.getContextData().getValue("stackTrace"))
+ .exceptionMessage(event.getContextData().getValue("exceptionMessage"))
.origin(event.getLoggerName())
.build();
--
GitLab