diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/DefaultScriptTrace.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/DefaultScriptTrace.java index f386a45bb44..e158bf2cd16 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/DefaultScriptTrace.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/DefaultScriptTrace.java @@ -15,6 +15,7 @@ import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; +import java.util.StringJoiner; public class DefaultScriptTrace implements ScriptTrace, ScriptTraceEnhancer.ScriptTraceContext { @@ -62,4 +63,14 @@ public Map getTraceTags() { public Duration getDuration() { return duration; } + + @Override + public String toString() { + return new StringJoiner(", ", DefaultScriptTrace.class.getSimpleName() + "[", "]") + .add("duration=" + duration) + .add("request=" + request) + .add("exception=" + exception) + .add("traceTags=" + traceTags) + .toString(); + } } diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptEngineRequest.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptEngineRequest.java index 5770ba9a1e2..6eb3871b4bd 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptEngineRequest.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptEngineRequest.java @@ -14,6 +14,7 @@ import java.util.LinkedList; import java.util.List; +import java.util.StringJoiner; import org.flowable.common.engine.api.FlowableIllegalStateException; import org.flowable.common.engine.api.variable.VariableContainer; @@ -183,4 +184,14 @@ public List getAdditionalResolvers() { public ScriptTraceEnhancer getTraceEnhancer() { return traceEnhancer; } + + @Override + public String toString() { + return new StringJoiner(", ", ScriptEngineRequest.class.getSimpleName() + "[", "]") + .add("language='" + language + "'") + .add("script='" + script + "'") + .add("variableContainer=" + variableContainer) + .add("storeScriptVariables=" + storeScriptVariables) + .toString(); + } } diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptingEngines.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptingEngines.java index 288458d694c..57206ad30cf 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptingEngines.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/scripting/ScriptingEngines.java @@ -96,7 +96,7 @@ protected Object evaluate(ScriptEngine scriptEngine, ScriptEngineRequest request } catch (ScriptException e) { DefaultScriptTrace scriptTrace = DefaultScriptTrace.errorTrace(Duration.ofNanos(System.nanoTime() - startNanos), request, e); if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Caught exception evaluating script. {}{}{}", request.getLanguage(), System.lineSeparator(), + LOGGER.debug("Caught exception evaluating script for {}. {}{}{}", request.getVariableContainer(), request.getLanguage(), System.lineSeparator(), request.getScript()); } enhanceScriptTrace(request, scriptTrace); @@ -115,7 +115,7 @@ protected void notifyScriptTraceListener(ScriptTraceListener listener, ScriptTra try { listener.onScriptTrace(scriptTrace); } catch (Exception e) { - LOGGER.warn("Exception while executing scriptTraceListener: {}", e.getMessage(), e); + LOGGER.warn("Exception while executing scriptTraceListener: {} with {}", listener, scriptTrace, e); } } diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/ScriptTaskActivityBehavior.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/ScriptTaskActivityBehavior.java index 1e801193b14..d753b91edcf 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/ScriptTaskActivityBehavior.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/ScriptTaskActivityBehavior.java @@ -93,7 +93,7 @@ protected void safelyExecuteScript(DelegateExecution execution) { try { executeScript(execution); } catch (FlowableException e) { - LOGGER.warn("Exception while executing {} : {}", execution.getCurrentFlowElement().getId(), e.getMessage()); + LOGGER.warn("Exception while executing {} : {}", execution, e.getMessage()); noErrors = false; Throwable rootCause = ExceptionUtils.getRootCause(e);