Do not use Jansi in direct mode

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3e3c8f43
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3e3c8f43
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3e3c8f43

Branch: refs/heads/LOG4J2-1395
Commit: 3e3c8f43f80e42a9d4e8d3c132dbd40b5d05c34c
Parents: 10f724f
Author: Mikael StÃ¥ldal <[email protected]>
Authored: Tue Jun 7 11:31:36 2016 +0200
Committer: Mikael StÃ¥ldal <[email protected]>
Committed: Tue Jun 7 11:31:36 2016 +0200

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/appender/ConsoleAppender.java   | 2 +-
 src/site/xdoc/manual/appenders.xml                                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e3c8f43/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 3f86457..2e3b38f 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -265,7 +265,7 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender<OutputSt
             throw new IllegalStateException("Unsupported default encoding " + 
enc, ex);
         }
         final PropertiesUtil propsUtil = PropertiesUtil.getProperties();
-        if (!propsUtil.isOsWindows() || 
propsUtil.getBooleanProperty("log4j.skipJansi")) {
+        if (!propsUtil.isOsWindows() || 
propsUtil.getBooleanProperty("log4j.skipJansi") || direct) {
             return outputStream;
         }
         try {

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e3c8f43/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/appenders.xml 
b/src/site/xdoc/manual/appenders.xml
index 918dd66..a1f974e 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -194,7 +194,8 @@
               <td>direct</td>
               <td>boolean</td>
               <td>Write directly to <code>java.io.FileDescriptor</code> and 
bypass <code>java.lang.System.out/.err</code>.
-                Can give up to 10x performance boost. Cannot be used with 
<code>follow</code>.</td>
+                Can give up to 10x performance boost. Cannot be used with 
Jansi on Windows.
+                Cannot be used with <code>follow</code>.</td>
             </tr>
             <tr>
               <td>name</td>

Reply via email to