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 447294b41bc76de33863c400eec2ae656ba2f50a..843e7a4556c3455f101f1549151b8a8289797cf1 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 741a35bab641fab5087f4d43eb97386baa6e0271..3156cfcfe97ffcc079a7c162b8663dff7b1971ae 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();