Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8511A101D0 for ; Fri, 27 Sep 2013 06:26:23 +0000 (UTC) Received: (qmail 92261 invoked by uid 500); 27 Sep 2013 06:26:23 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 92234 invoked by uid 500); 27 Sep 2013 06:26:20 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 92226 invoked by uid 99); 27 Sep 2013 06:26:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 06:26:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 06:26:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2F43D2388ABC; Fri, 27 Sep 2013 06:25:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1526807 - in /logging/log4j/log4j2/trunk: log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/ src/changes/ Date: Fri, 27 Sep 2013 06:25:57 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130927062557.2F43D2388ABC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Fri Sep 27 06:25:56 2013 New Revision: 1526807 URL: http://svn.apache.org/r1526807 Log: LOG4J2-404 - @EnterpriseNumber was missing in the ID of structured data when RFC5424Layout is used Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java logging/log4j/log4j2/trunk/src/changes/changes.xml Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1526807&r1=1526806&r2=1526807&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Fri Sep 27 06:25:56 2013 @@ -381,14 +381,15 @@ public class RFC5424Layout extends Abstr final StructuredDataMessage data = (StructuredDataMessage) message; final Map map = data.getData(); final StructuredDataId id = data.getId(); + final String sdId = getId(id); - if (sdElements.containsKey(id.toString())) { + if (sdElements.containsKey(sdId)) { final StructuredDataElement union = sdElements.get(id.toString()); union.union(map); - sdElements.put(id.toString(), union); + sdElements.put(sdId, union); } else { final StructuredDataElement formattedData = new StructuredDataElement(map, false); - sdElements.put(id.toString(), formattedData); + sdElements.put(sdId, formattedData); } } Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java?rev=1526807&r1=1526806&r2=1526807&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Fri Sep 27 06:25:56 2013 @@ -275,6 +275,19 @@ public class FlumePersistentAppenderTest fields[i]); } } + + @Test + public void testRFC5424Layout() throws InterruptedException, IOException { + + final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test"); + EventLogger.logEvent(msg); + + final Event event = primary.poll(); + Assert.assertNotNull(event); + final String body = getBody(event); + Assert.assertTrue("Structured message does not contain @EID: " + body, + body.contains("Test@18060")); + } private class WriterThread extends Thread { Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1526807&r1=1526806&r2=1526807&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Fri Sep 27 06:25:56 2013 @@ -21,6 +21,9 @@ + + @EnterpriseNumber" was missing in the ID of structured data when RFC5424Layout is used + Fixed issue that prevented Log4J from working in Google App Engine.