[FIXED JENKINS-27392] Handling ConsoleLogFilter.

jenkinsci · Mar 30, 2015 · 38cd1ea · 38cd1ea
1 parent 05916af
commit 38cd1ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/step-api/src/main/java/org/jenkinsci/plugins/workflow/steps/BodyInvoker.java b/step-api/src/main/java/org/jenkinsci/plugins/workflow/steps/BodyInvoker.java
@@ -46,6 +46,7 @@ public abstract class BodyInvoker {
      * <dl>
      * <dt>{@link EnvVars}<dd>use {@link EnvironmentExpander} instead
      * <dt>{@link EnvironmentExpander}<dd>use {@link EnvironmentExpander#merge}
+     * <dt>{@link ConsoleLogFilter}<dd>merge two instances if present; your implementation should expect {@code null} for the {@code build} parameter, and be {@link Serializable}
      * </dl>
      * @see StepContext#get(Class)
      *

diff --git a/support/src/main/java/org/jenkinsci/plugins/workflow/support/DefaultStepContext.java b/support/src/main/java/org/jenkinsci/plugins/workflow/support/DefaultStepContext.java
@@ -26,6 +26,7 @@
 
 import hudson.EnvVars;
 import hudson.Launcher;
+import hudson.console.ConsoleLogFilter;
 import hudson.model.Computer;
 import hudson.model.Job;
 import hudson.model.Node;
@@ -34,6 +35,7 @@
 import hudson.util.StreamTaskListener;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.charset.Charset;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -88,8 +90,12 @@ public abstract class DefaultStepContext extends StepContext {
                     la = new LogActionImpl(getNode(), Charset.defaultCharset());
                     getNode().addAction(la);
                 }
-
-                listener = new StreamTaskListener(new FileOutputStream(la.getLogFile(), true));
+                ConsoleLogFilter filter = get(ConsoleLogFilter.class);
+                OutputStream os = new FileOutputStream(la.getLogFile(), true);
+                if (filter != null) {
+                    os = filter.decorateLogger(null, os);
+                }
+                listener = new StreamTaskListener(os);
                 getExecution().addListener(new GraphListener() {
                     @Override public void onNewHead(FlowNode node) {
                         try {