From c28b3e26b2850ffdffa22c1776b319a77a11dfdf Mon Sep 17 00:00:00 2001
From: Edvard Fonsell <edvard.fonsell@nitorcreations.com>
Date: Mon, 1 Feb 2021 18:27:15 +0200
Subject: [PATCH] log state name that threw exception

---
 .../engine/internal/executor/WorkflowStateProcessor.java | 9 +++++----
 .../engine/workflow/definition/ExceptionSeverity.java    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java b/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java
index 382fcb6d8..3ae124c59 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/internal/executor/WorkflowStateProcessor.java
@@ -202,15 +202,16 @@ private void runImpl() {
 
   private void logRetryableException(WorkflowState state, Throwable t) {
     ExceptionSeverity exceptionSeverity = state.getExceptionSeverity(t);
-    BiConsumer<String, Object> logMethod = getLogMethod(exceptionSeverity.logLevel);
+    BiConsumer<String, Object[]> logMethod = getLogMethod(exceptionSeverity.logLevel);
     if (exceptionSeverity.logStackTrace) {
-      logMethod.accept("Handler threw a retryable exception, trying again later.", t);
+      logMethod.accept("Handling state '{}' threw a retryable exception, trying again later.", new Object[] { state.name(), t });
     } else {
-      logMethod.accept("Handler threw a retryable exception, trying again later. Message: {}", t.getMessage());
+      logMethod.accept("Handling state '{}' threw a retryable exception, trying again later. Message: {}",
+          new Object[] { state.name(), t.getMessage() });
     }
   }
 
-  private BiConsumer<String, Object> getLogMethod(Level logLevel) {
+  private BiConsumer<String, Object[]> getLogMethod(Level logLevel) {
     switch (logLevel) {
     case TRACE:
       return logger::trace;
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/ExceptionSeverity.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/ExceptionSeverity.java
index 01cc2b849..101888088 100644
--- a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/ExceptionSeverity.java
+++ b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/ExceptionSeverity.java
@@ -5,7 +5,7 @@
 import org.slf4j.event.Level;
 
 public class ExceptionSeverity {
-  public static final ExceptionSeverity DEFAULT = new ExceptionSeverity(ERROR, true);
+  public static final ExceptionSeverity DEFAULT = new ExceptionSeverity.Builder().build();
   public final Level logLevel;
   public final boolean logStackTrace;