Skip to content

Commit 117c22b

Browse files
committed
Use Functions.printThrowable to provide more legible stack traces in 2.43+.
1 parent 43d1a5f commit 117c22b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.common.collect.ImmutableSet;
2828
import hudson.AbortException;
2929
import hudson.Extension;
30+
import hudson.Functions;
3031
import hudson.model.Result;
3132
import hudson.model.Run;
3233
import hudson.model.TaskListener;
@@ -106,7 +107,7 @@ private static final class Callback extends BodyExecutionCallback {
106107
fie.handle(context.get(Run.class), listener);
107108
r = fie.getResult();
108109
} else {
109-
t.printStackTrace(listener.getLogger());
110+
listener.getLogger().println(Functions.printThrowable(t).trim()); // TODO 2.43+ use Functions.printStackTrace
110111
}
111112
context.get(Run.class).setResult(r);
112113
context.onSuccess(null);

src/main/java/org/jenkinsci/plugins/workflow/steps/RetryStepExecution.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
44
import hudson.AbortException;
5+
import hudson.Functions;
56
import hudson.model.TaskListener;
67
import jenkins.model.CauseOfInterruption;
78

@@ -76,7 +77,7 @@ public void onFailure(StepContext context, Throwable t) {
7677
if (t instanceof AbortException) {
7778
l.error(t.getMessage());
7879
} else {
79-
t.printStackTrace(l.error("Execution failed"));
80+
l.error("Execution failed").println(Functions.printThrowable(t).trim()); // TODO 2.43+ use Functions.printStackTrace
8081
}
8182
l.getLogger().println("Retrying");
8283
context.newBodyInvoker().withCallback(this).start();

0 commit comments

Comments
 (0)