Merge pull request #4689 from eclipse/jetty-10.0.x-4620-stderr-consol…

…e-capture Issue #4620 - support alt PrintStream in StdErrAppender properly
jetty · Mar 23, 2020 · dfc2568 · dfc2568
2 parents ea1418a + fc722bf
commit dfc2568
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StdErrAppender.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StdErrAppender.java
@@ -57,11 +57,11 @@ public class StdErrAppender implements JettyAppender
     /**
      * The stream to write logging events to.
      */
-    private PrintStream stderr;
+    private PrintStream stream;
 
     public StdErrAppender(JettyLoggerConfiguration config)
     {
-        this(config, System.err);
+        this(config, null);
     }
 
     public StdErrAppender(JettyLoggerConfiguration config, PrintStream stream)
@@ -72,7 +72,7 @@ public StdErrAppender(JettyLoggerConfiguration config, PrintStream stream)
     public StdErrAppender(JettyLoggerConfiguration config, PrintStream stream, TimeZone timeZone)
     {
         Objects.requireNonNull(config, "JettyLoggerConfiguration");
-        this.stderr = Objects.requireNonNull(stream, "PrintStream");
+        this.stream = stream;
 
         TimeZone tzone = timeZone;
         if (tzone == null)
@@ -96,7 +96,14 @@ public void emit(JettyLogger logger, Level level, long timestamp, String threadN
     {
         StringBuilder builder = new StringBuilder(64);
         format(builder, logger, level, timestamp, threadName, throwable, message, argumentArray);
-        stderr.println(builder);
+        if (stream != null)
+        {
+            stream.println(builder);
+        }
+        else
+        {
+            System.err.println(builder);
+        }
     }
 
     public boolean isCondensedNames()
@@ -116,12 +123,12 @@ public int getThreadPadding()
 
     public PrintStream getStream()
     {
-        return stderr;
+        return stream;
     }
 
     public void setStream(PrintStream stream)
     {
-        this.stderr = stream;
+        this.stream = stream;
     }
 
     private void format(StringBuilder builder, JettyLogger logger, Level level, long timestamp, String threadName, Throwable throwable, String message, Object... argumentArray)