You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/04 15:23:14 UTC

[36/50] [abbrv] logging-log4j2 git commit: LOG4J2-1252 - JeroMqAppender should support layouts

LOG4J2-1252 - JeroMqAppender should support layouts


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

Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 60d1ccd9349e4601464d53926595146a59ac4beb
Parents: ebc53bb
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Mar 2 20:42:04 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Mar 2 20:42:04 2016 -0600

----------------------------------------------------------------------
 .../logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java  | 5 +++--
 src/changes/changes.xml                                         | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/60d1ccd9/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
index 974477b..99968e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
@@ -244,8 +244,9 @@ public final class JeroMqAppender extends AbstractAppender {
 
     @Override
     public synchronized void append(final LogEvent event) {
-        final String formattedMessage = event.getMessage().getFormattedMessage();
-        if (getPublisher().send(formattedMessage, 0)) {
+        final Layout<? extends Serializable> layout = getLayout();
+        final byte[] formattedMessage = layout.toByteArray(event);
+        if (getPublisher().send(getLayout().toByteArray(event))) {
             sendRcTrue++;
         } else {
             sendRcFalse++;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/60d1ccd9/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 30f7a67..646a41f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -181,6 +181,9 @@
       <action issue="LOG4J2-1262" dev="mattsicker" type="fix">
         Stop throwing unnecessary exception in Log4jServletContextListener.contextDestroyed().
       </action>
+      <action issue="LOG4J2-1252" dev="mattsicker" type="add">
+        JeroMqAppender should support layouts.
+      </action>
     </release>
     <release version="2.5" date="2015-12-06" description="GA Release 2.5">
       <action issue="LOG4J2-324" dev="rpopma" type="fix">