ScriptRunner: Fix for not outputting Exception cause

threadly · Sep 23, 2019 · 6a01e28 · 6a01e28
1 parent 015fb50
commit 6a01e28
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/src/main/java/org/threadly/load/ScriptRunner.java b/src/main/java/org/threadly/load/ScriptRunner.java
@@ -125,26 +125,37 @@ protected void handleRunFinish(List<ListenableFuture<StepResult>> rawFutures,
       out(fails.size() + " STEPS FAILED!!" + System.lineSeparator());
       {
         Iterator<StepResult> it = fails.iterator();
+        StringBuilder sb = new StringBuilder();
         while (it.hasNext()) {
+          sb.setLength(0);
           StepResult tr = it.next();
-          StringBuilder sb = new StringBuilder();
-          sb.append(tr.getError().toString()).append(System.lineSeparator());
-          StackTraceElement[] origStack = tr.getError().getStackTrace();
-          StackTraceElement[] trimmedStack;
-          if (TRIM_AMBUSH_STACK_AWAY) {
-            String packageStr = ScriptRunner.class.getPackage().getName();
-            int i = 1;
-            for (; i < origStack.length; i++) {
-              if (origStack[i].getClassName().startsWith(packageStr)) {
-                break;
+          Throwable t = tr.getError();
+          while (t != null) {
+            if (sb.length() > 0) {
+              // will have line separator from last loop
+              sb.append("Caused by: ");
+            }
+
+            sb.append(t.toString()).append(System.lineSeparator());
+            StackTraceElement[] origStack = t.getStackTrace();
+            StackTraceElement[] trimmedStack;
+            if (TRIM_AMBUSH_STACK_AWAY) {
+              String packageStr = ScriptRunner.class.getPackage().getName();
+              int i = 1;
+              for (; i < origStack.length; i++) {
+                if (origStack[i].getClassName().startsWith(packageStr)) {
+                  break;
+                }
               }
+              trimmedStack = Arrays.copyOf(origStack, i);
+            } else {
+              trimmedStack = origStack;
             }
-            trimmedStack = Arrays.copyOf(origStack, i);
-          } else {
-            trimmedStack = origStack;
+            ExceptionUtils.writeStackTo(trimmedStack, sb);
+            
+            t = t.getCause();
           }
-          ExceptionUtils.writeStackTo(trimmedStack, sb);
-          String errorMsg = sb.toString(); 
+          String errorMsg = sb.toString();
           List<StepResult> currentSteps = failureCountMap.get(errorMsg);
           if (currentSteps == null) {
             currentSteps = new ArrayList<StepResult>(1);