You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/08 14:04:00 UTC
[08/50] logging-log4j2 git commit: LOG4J2-1343 modified
AbstractOutputStreamAppender to add support for subclasses to use the
garbage-free Layout mechanism
LOG4J2-1343 modified AbstractOutputStreamAppender to add support for subclasses to use the garbage-free Layout mechanism
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1e4dd880
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1e4dd880
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1e4dd880
Branch: refs/heads/LOG4J2-1356
Commit: 1e4dd880c4790993852abfa3769a96a20ded83ef
Parents: 49878b4
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 7 02:55:22 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 7 02:55:22 2016 +0900
----------------------------------------------------------------------
.../appender/AbstractOutputStreamAppender.java | 50 ++++++++++++++++----
1 file changed, 40 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1e4dd880/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 7ed06d6..dcd0556 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -20,10 +20,12 @@ import java.io.Serializable;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.layout.ByteBufferDestination;
+import org.apache.logging.log4j.core.util.Constants;
/**
* Appends log events as bytes to a byte output stream. The stream encoding is defined in the layout.
- *
+ *
* @param <M> The kind of {@link OutputStreamManager} under management
*/
public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager> extends AbstractAppender {
@@ -41,7 +43,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
/**
* Instantiates a WriterAppender and set the output destination to a new {@link java.io.OutputStreamWriter}
* initialized with <code>os</code> as its {@link java.io.OutputStream}.
- *
+ *
* @param name The name of the Appender.
* @param layout The layout to format the message.
* @param manager The OutputStreamManager.
@@ -51,11 +53,16 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
super(name, filter, layout, ignoreExceptions);
this.manager = manager;
this.immediateFlush = immediateFlush;
+
+ if (Constants.ENABLE_DIRECT_ENCODERS) {
+ final ByteBufferDestination destination = manager.createByteBufferDestination(immediateFlush);
+ manager.setByteBufferDestination(destination);
+ }
}
/**
* Gets the immediate flush setting.
- *
+ *
* @return immediate flush.
*/
public boolean getImmediateFlush() {
@@ -64,7 +71,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
/**
* Gets the manager.
- *
+ *
* @return the manager.
*/
public M getManager() {
@@ -93,20 +100,43 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
* <p>
* Most subclasses of <code>AbstractOutputStreamAppender</code> will need to override this method.
* </p>
- *
+ *
* @param event The LogEvent.
*/
@Override
public void append(final LogEvent event) {
try {
- final byte[] bytes = getLayout().toByteArray(event);
- if (bytes != null && bytes.length > 0) {
- manager.write(bytes, this.immediateFlush || event.isEndOfBatch());
- }
+ tryAppend(event);
} catch (final AppenderLoggingException ex) {
- error("Unable to write to stream " + manager.getName() + " for appender " + getName());
+ error("Unable to write to stream " + manager.getName() + " for appender " + getName() + ": " + ex);
throw ex;
}
}
+ private void tryAppend(final LogEvent event) {
+ if (Constants.ENABLE_DIRECT_ENCODERS) {
+ directEncodeEvent(event);
+ } else {
+ writeByteArrayToManager(event);
+ }
+ }
+
+ protected void directEncodeEvent(final LogEvent event) {
+ synchronized (manager) {
+ getLayout().encode(event, manager.getByteBufferDestination());
+ if (!manager.isBufferedIO()) { // buffering was not requested by the user
+ manager.flushBuffer(); // we're not allowed to leave anything in the buffer: drain buffer into manager
+ }
+ if (this.immediateFlush || event.isEndOfBatch()) {
+ manager.flush();
+ }
+ }
+ }
+
+ protected void writeByteArrayToManager(final LogEvent event) {
+ final byte[] bytes = getLayout().toByteArray(event);
+ if (bytes != null && bytes.length > 0) {
+ manager.write(bytes, this.immediateFlush || event.isEndOfBatch());
+ }
+ }
}