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/08/23 15:46:06 UTC

[1/2] logging-log4j2 git commit: LOG4J2-1447 Log4j1MdcPatternConverter: use TriConsumer to loop over key-value pairs in the event's context data

Repository: logging-log4j2
Updated Branches:
  refs/heads/LOG4J2-1349-gcfree-threadcontext 457b55373 -> 1279847e7


LOG4J2-1447 Log4j1MdcPatternConverter: use TriConsumer to loop over key-value pairs in the event's context data


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

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 24ac63b63faf831039d3e8e31d47a510efafeb8e
Parents: e5a3b9e
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 24 00:42:33 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 24 00:42:33 2016 +0900

----------------------------------------------------------------------
 .../pattern/Log4j1MdcPatternConverter.java      | 23 +++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24ac63b6/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
index c124551..3db93a7 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
@@ -21,10 +21,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.pattern.ConverterKeys;
 import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
 import org.apache.logging.log4j.core.pattern.PatternConverter;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import org.apache.logging.log4j.core.util.TriConsumer;
 
 /**
  * Able to handle the contents of the LogEvent's MDC and either
@@ -68,24 +65,24 @@ public final class Log4j1MdcPatternConverter extends LogEventPatternConverter {
      */
     @Override
     public void format(final LogEvent event, final StringBuilder toAppendTo) {
-        final Map<String, String> contextMap = event.getContextMap();
         if (key == null) {
             // if there is no additional options, we output every single Key/Value pair for the MDC
             toAppendTo.append('{');
-            if (contextMap != null && !contextMap.isEmpty()) {
-                final Set<String> eventKeys = new TreeSet<>(contextMap.keySet());
-                for (final String eventKey : eventKeys) {
-                    toAppendTo.append('{').append(eventKey).append(',').append(contextMap.get(eventKey)).append('}');
-
-                }
-            }
+            event.getContextData().forEach(APPEND_EACH, toAppendTo);
             toAppendTo.append('}');
         } else {
             // otherwise they just want a single key output
-            final Object val = contextMap.get(key);
+            final Object val = event.getContextData().getValue(key);
             if (val != null) {
                 toAppendTo.append(val);
             }
         }
     }
+
+    private static TriConsumer<String, Object, StringBuilder> APPEND_EACH = new TriConsumer<String, Object, StringBuilder>() {
+        @Override
+        public void accept(final String key, final Object value, final StringBuilder toAppendTo) {
+            toAppendTo.append('{').append(key).append(',').append(value).append('}');
+        }
+    };
 }


[2/2] logging-log4j2 git commit: Merge branch 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into LOG4J2-1349-gcfree-threadcontext

Posted by rp...@apache.org.
Merge branch 'LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure' into LOG4J2-1349-gcfree-threadcontext


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

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 1279847e7b8293c03d9a97f92984770af3099baf
Parents: 457b553 24ac63b
Author: rpopma <rp...@apache.org>
Authored: Wed Aug 24 00:45:51 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Aug 24 00:45:51 2016 +0900

----------------------------------------------------------------------
 .../pattern/Log4j1MdcPatternConverter.java      | 23 +++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------