- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-33-gf0b1a77
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via f0b1a778e9000cadf586790d670cb75ad36bdf3a (commit) from 7a2e02bca24d872d580694ab89a865542103e570 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=f0b1a778e9000cadf586790d… http://github.com/ceki/logback/commit/f0b1a778e9000cadf586790d670cb75ad36bd… commit f0b1a778e9000cadf586790d670cb75ad36bdf3a Author: Tomasz Nurkiewicz <nurkiewicz(a)gmail.com> Date: Mon Aug 16 01:31:43 2010 +0800 [LBCLASSIC-217] Exception stack trace printing starting from root cause diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java index 9cab8e7..ef32df3 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java @@ -35,6 +35,7 @@ import ch.qos.logback.classic.pattern.MessageConverter; import ch.qos.logback.classic.pattern.MethodOfCallerConverter; import ch.qos.logback.classic.pattern.NopThrowableInformationConverter; import ch.qos.logback.classic.pattern.RelativeTimeConverter; +import ch.qos.logback.classic.pattern.RootCauseFirstThrowableProxyConverter; import ch.qos.logback.classic.pattern.ThreadConverter; import ch.qos.logback.classic.pattern.ThrowableProxyConverter; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -100,6 +101,9 @@ public class PatternLayout extends PatternLayoutBase<ILoggingEvent> { defaultConverterMap.put("ex", ThrowableProxyConverter.class.getName()); defaultConverterMap.put("exception", ThrowableProxyConverter.class .getName()); + defaultConverterMap.put("rEx", RootCauseFirstThrowableProxyConverter.class.getName()); + defaultConverterMap.put("rootException", RootCauseFirstThrowableProxyConverter.class + .getName()); defaultConverterMap.put("throwable", ThrowableProxyConverter.class .getName()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java new file mode 100644 index 0000000..3ed88e4 --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java @@ -0,0 +1,54 @@ +package ch.qos.logback.classic.pattern; + +import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; +import ch.qos.logback.classic.spi.IThrowableProxy; +import ch.qos.logback.classic.spi.StackTraceElementProxy; +import ch.qos.logback.classic.spi.ThrowableProxyUtil; +import ch.qos.logback.core.CoreConstants; + +/** + * @author Tomasz Nurkiewicz + * @since 2010-08-07, 14:07:10 + */ +public class RootCauseFirstThrowableProxyConverter extends ExtendedThrowableProxyConverter { + + @Override + protected String printThrowableToString(IThrowableProxy tp) { + StringBuilder buf = new StringBuilder(2048); + printRootCauseFirst(tp, buf); + return buf.toString(); + } + + private void printRootCauseFirst(IThrowableProxy tp, StringBuilder buf) { + if (tp.getCause() != null) + printRootCauseFirst(tp.getCause(), buf); + printRootCause(tp, buf); + } + + private void printRootCause(IThrowableProxy tp, StringBuilder buf) { + ThrowableProxyUtil.printFirstLineRootCauseFirst(buf, tp); + buf.append(CoreConstants.LINE_SEPARATOR); + StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); + int commonFrames = tp.getCommonFrames(); + + boolean unrestrictedPrinting = lengthOption > stepArray.length; + int length = (unrestrictedPrinting) ? stepArray.length : lengthOption; + + + int maxIndex = length; + if (commonFrames > 0 && unrestrictedPrinting) { + maxIndex -= commonFrames; + } + + for (int i = 0; i < maxIndex; i++) { + String string = stepArray[i].toString(); + buf.append(CoreConstants.TAB); + buf.append(string); + extraData(buf, stepArray[i]); // allow other data to be added + buf.append(CoreConstants.LINE_SEPARATOR); + } + + } + + +} diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java index 0a68cf8..3ddb1e5 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java @@ -96,7 +96,6 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { } public String convert(ILoggingEvent event) { - StringBuilder buf = new StringBuilder(32); IThrowableProxy tp = event.getThrowableProxy(); if (tp == null) { @@ -135,10 +134,16 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { } } - while (tp != null) { - printThrowableProxy(buf, tp); - tp = tp.getCause(); + return printThrowableToString(tp); } + + protected String printThrowableToString(IThrowableProxy tp) { + StringBuilder buf = new StringBuilder(32); + IThrowableProxy currentThrowable = tp; + while (currentThrowable != null) { + printThrowableProxy(buf, currentThrowable); + currentThrowable = currentThrowable.getCause(); + } return buf.toString(); } @@ -166,7 +171,7 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { } if (commonFrames > 0 && unrestrictedPrinting) { - buf.append("\t... " + tp.getCommonFrames()).append( + buf.append("\t... ").append(tp.getCommonFrames()).append( " common frames omitted").append(CoreConstants.LINE_SEPARATOR); } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java index c02cadd..1283bce 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java @@ -117,7 +117,7 @@ public class ThrowableProxyUtil { } if (commonFrames > 0) { - sb.append("\t... " + commonFrames).append(" common frames omitted") + sb.append("\t... ").append(commonFrames).append(" common frames omitted") .append(CoreConstants.LINE_SEPARATOR); } @@ -128,6 +128,17 @@ public class ThrowableProxyUtil { if (commonFrames > 0) { buf.append(CoreConstants.CAUSED_BY); } + printExceptionMessage(buf, tp); + } + + static public void printFirstLineRootCauseFirst(StringBuilder buf, IThrowableProxy tp) { + if (tp.getCause() != null) { + buf.append(CoreConstants.WRAPPED_BY); + } + printExceptionMessage(buf, tp); + } + + private static void printExceptionMessage(StringBuilder buf, IThrowableProxy tp) { buf.append(tp.getClassName()).append(": ").append(tp.getMessage()); } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverterTest.java new file mode 100644 index 0000000..ccd0873 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverterTest.java @@ -0,0 +1,103 @@ +package ch.qos.logback.classic.pattern; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.LoggingEvent; +import org.junit.Before; +import org.junit.Test; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static ch.qos.logback.classic.util.TeztHelper.makeNestedException; +import static ch.qos.logback.classic.util.TeztHelper.positionOf; +import static org.fest.assertions.Assertions.assertThat; + +/** + * @author Tomasz Nurkiewicz + * @since 2010-08-15, 18:34:21 + */ +public class RootCauseFirstThrowableProxyConverterTest { + + private LoggerContext context = new LoggerContext(); + private ThrowableProxyConverter converter = new RootCauseFirstThrowableProxyConverter(); + private StringWriter stringWriter = new StringWriter(); + private PrintWriter printWriter = new PrintWriter(stringWriter); + + @Before + public void setUp() throws Exception { + converter.setContext(context); + converter.start(); + } + + private ILoggingEvent createLoggingEvent(Throwable t) { + return new LoggingEvent(this.getClass().getName(), context + .getLogger(Logger.ROOT_LOGGER_NAME), Level.DEBUG, "test message", t, + null); + } + + @Test + public void integration() { + //given + PatternLayout pl = new PatternLayout(); + pl.setContext(context); + pl.setPattern("%m%rEx%n"); + pl.start(); + + //when + ILoggingEvent e = createLoggingEvent(new Exception("x")); + String result = pl.doLayout(e); + + //then + // make sure that at least some package data was output + Pattern p = Pattern.compile(" \\[junit.*\\]"); + Matcher m = p.matcher(result); + int i = 0; + while(m.find()) { + i++; + } + assertThat(i).isGreaterThan(5); + } + + @Test + public void smoke() { + //given + Exception exception = new Exception("smoke"); + exception.printStackTrace(printWriter); + + //when + ILoggingEvent le = createLoggingEvent(exception); + String result = converter.convert(le); + + //then + result = result.replace("common frames omitted", "more"); + result = result.replaceAll(" ~?\\[.*\\]", ""); + assertThat(result).isEqualTo(stringWriter.toString()); + } + + @Test + public void nested() { + //given + Throwable nestedException = makeNestedException(2); + nestedException.printStackTrace(printWriter); + + //when + ILoggingEvent le = createLoggingEvent(nestedException); + String result = converter.convert(le); + + //then + assertThat(result).startsWith("java.lang.Exception: nesting level=0"); + assertThat( + positionOf("nesting level=0").in(result)).isLessThan( + positionOf("nesting level =1").in(result)); + assertThat( + positionOf("nesting level =1").in(result)).isLessThan( + positionOf("nesting level =2").in(result)); + } + +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztHelper.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztHelper.java index f9f848d..badde04 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztHelper.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztHelper.java @@ -23,4 +23,35 @@ public class TeztHelper { Throwable cause = makeNestedException(level - 1); return new Exception("nesting level =" + level, cause); } + + /** + * Usage: + * <pre> + * String s = "123"; + * positionOf("1").in(s) < positionOf("3").in(s) + * </pre> + * + * @param pattern Plain text to be found + * @return StringPosition fluent interface + */ + public static StringPosition positionOf(String pattern) { + return new StringPosition(pattern); + } + + public static class StringPosition { + private final String pattern; + + public StringPosition(String pattern) { + this.pattern = pattern; + } + + public int in(String s) { + final int position = s.indexOf(pattern); + if(position < 0) + throw new IllegalArgumentException("String '" + pattern + "' not found in: '" + s + "'"); + return position; + } + + } + } ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/classic/PatternLayout.java | 4 + .../RootCauseFirstThrowableProxyConverter.java | 54 ++++++++++ .../classic/pattern/ThrowableProxyConverter.java | 15 ++- .../logback/classic/spi/ThrowableProxyUtil.java | 13 +++- .../RootCauseFirstThrowableProxyConverterTest.java | 103 ++++++++++++++++++++ .../ch/qos/logback/classic/util/TeztHelper.java | 31 ++++++ 6 files changed, 214 insertions(+), 6 deletions(-) create mode 100644 logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverterTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-289) ConcurrentModificationException when using MDC
by Josh Oddman (JIRA) 20 Sep '11

20 Sep '11

ConcurrentModificationException when using MDC ---------------------------------------------- Key: LBCLASSIC-289 URL: http://jira.qos.ch/browse/LBCLASSIC-289 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.29 Environment: Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02-383, mixed mode) Darwin aden 11.1.0 Darwin Kernel Version 11.1.0: Tue Jul 26 16:07:11 PDT 2011; root:xnu-1699.22.81~1/RELEASE_X86_64 x86_64 Reporter: Josh Oddman Assignee: Logback dev list In some rare cases in multithreaded environment MDC.put throws ConcurrentModificationException. java.util.ConcurrentModificationException: null at java.util.HashMap$HashIterator.nextEntry(HashMap.java:793) ~[na:1.6.0_26] at java.util.HashMap$EntryIterator.next(HashMap.java:834) ~[na:1.6.0_26] at java.util.HashMap$EntryIterator.next(HashMap.java:832) ~[na:1.6.0_26] at java.util.HashMap.putAll(HashMap.java:523) ~[na:1.6.0_26] at ch.qos.logback.classic.util.LogbackMDCAdapter.duplicateAndInsertNewMap(LogbackMDCAdapter.java:69) ~[logback-classic-0.9.29.jar:na] at ch.qos.logback.classic.util.LogbackMDCAdapter.put(LogbackMDCAdapter.java:95) ~[logback-classic-0.9.29.jar:na] at org.slf4j.MDC.put(MDC.java:112) ~[slf4j-api-1.6.1.jar:1.6.1] -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-32-g7a2e02b
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 7a2e02bca24d872d580694ab89a865542103e570 (commit) from 3c983ccd0dd39ca006d78a0c086966e99693821c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=7a2e02bca24d872d580694ab… http://github.com/ceki/logback/commit/7a2e02bca24d872d580694ab89a865542103e… commit 7a2e02bca24d872d580694ab89a865542103e570 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 20 21:50:42 2011 +0200 fix http://jira.qos.ch/browse/LBCLASSIC-289 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java index 4d494e9..b045016 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java @@ -15,8 +15,10 @@ package ch.qos.logback.classic.util; import java.util.HashMap; import java.util.Map; +import java.util.Collections; import java.util.Set; + import org.slf4j.spi.MDCAdapter; /** @@ -49,7 +51,7 @@ public final class LogbackMDCAdapter implements MDCAdapter { // Initially the contents of the thread local in parent and child threads // reference the same map. However, as soon as a thread invokes the put() // method, the maps diverge as they should. - final InheritableThreadLocal<HashMap<String, String>> copyOnInheritThreadLocal = new InheritableThreadLocal<HashMap<String, String>>(); + final InheritableThreadLocal<Map<String, String>> copyOnInheritThreadLocal = new InheritableThreadLocal<Map<String, String>>(); private static final int WRITE_OPERATION = 1; private static final int READ_OPERATION = 2; @@ -70,11 +72,16 @@ public final class LogbackMDCAdapter implements MDCAdapter { return lastOp == null || lastOp.intValue() == READ_OPERATION; } - private HashMap<String, String> duplicateAndInsertNewMap(HashMap<String, String> oldMap) { - HashMap<String, String> newMap = new HashMap<String, String>(); - if (oldMap != null) - newMap.putAll(oldMap); - // the newMap replaces the old one for serialisation's sake + private Map<String, String> duplicateAndInsertNewMap(Map<String, String> oldMap) { + Map<String, String> newMap = Collections.synchronizedMap(new HashMap<String, String>()); + if (oldMap != null) { + // we don't want the parent thread modifying oldMap while we are + // iterating over it + synchronized (oldMap) { + newMap.putAll(oldMap); + } + } + copyOnInheritThreadLocal.set(newMap); return newMap; } @@ -95,11 +102,13 @@ public final class LogbackMDCAdapter implements MDCAdapter { throw new IllegalArgumentException("key cannot be null"); } - HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); + Map<String, String> oldMap = copyOnInheritThreadLocal.get(); + //System.out.println(Thread.currentThread().toString()+", "+oldMap); + Integer lastOp = getAndSetLastOperation(WRITE_OPERATION); if (wasLastOpReadOrNull(lastOp) || oldMap == null) { - HashMap<String, String> newMap = duplicateAndInsertNewMap(oldMap); + Map<String, String> newMap = duplicateAndInsertNewMap(oldMap); newMap.put(key, val); } else { oldMap.put(key, val); @@ -114,13 +123,13 @@ public final class LogbackMDCAdapter implements MDCAdapter { if (key == null) { return; } - HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); + Map<String, String> oldMap = copyOnInheritThreadLocal.get(); if (oldMap == null) return; Integer lastOp = getAndSetLastOperation(WRITE_OPERATION); if (wasLastOpReadOrNull(lastOp)) { - HashMap<String, String> newMap = duplicateAndInsertNewMap(oldMap); + Map<String, String> newMap = duplicateAndInsertNewMap(oldMap); newMap.remove(key); } else { oldMap.remove(key); @@ -177,10 +186,8 @@ public final class LogbackMDCAdapter implements MDCAdapter { * null. */ public Map getCopyOfContextMap() { - // why aren't we setting lastOperation as follows? - // lastOperation.set(READ_OPERATION); - - HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); + lastOperation.set(READ_OPERATION); + Map<String, String> hashMap = copyOnInheritThreadLocal.get(); if (hashMap == null) { return null; } else { @@ -192,7 +199,7 @@ public final class LogbackMDCAdapter implements MDCAdapter { public void setContextMap(Map contextMap) { lastOperation.set(WRITE_OPERATION); - HashMap<String, String> newMap = new HashMap<String, String>(); + Map<String, String> newMap = Collections.synchronizedMap(new HashMap<String, String>()); newMap.putAll(contextMap); // the newMap replaces the old one for serialisation's sake diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java index f759df2..9703f58 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java @@ -22,6 +22,7 @@ import java.io.ObjectOutputStream; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.MDC; import org.slf4j.helpers.BogoPerf; import ch.qos.logback.classic.net.NOPOutputStream; @@ -53,6 +54,7 @@ public class LoggingEventSerializationPerfTest { @Before public void setUp() throws Exception { + MDC.clear(); oos = new ObjectOutputStream(noos); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java index c8251a1..dca0e26 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java @@ -20,11 +20,10 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import org.junit.Test; -import org.slf4j.MDC; - import ch.qos.logback.core.testUtil.RandomUtil; public class LogbackMDCAdapterTest { @@ -34,6 +33,8 @@ public class LogbackMDCAdapterTest { int diff = RandomUtil.getPositiveInt(); + private final LogbackMDCAdapter mdcAdapter = new LogbackMDCAdapter(); + /** * Test that CopyOnInheritThreadLocal does not barf when the @@ -43,12 +44,10 @@ public class LogbackMDCAdapterTest { */ @Test public void lbclassic77Test() throws InterruptedException { - LogbackMDCAdapter lma = new LogbackMDCAdapter(); - - HashMap<String, String> parentHM = getHashMapFromMDCAdapter(lma); + Map<String, String> parentHM = getMapFromMDCAdapter(mdcAdapter); assertNull(parentHM); - ChildThreadForMDCAdapter childThread = new ChildThreadForMDCAdapter(lma); + ChildThreadForMDCAdapter childThread = new ChildThreadForMDCAdapter(mdcAdapter); childThread.start(); childThread.join(); assertTrue(childThread.successul); @@ -57,57 +56,34 @@ public class LogbackMDCAdapterTest { @Test public void removeForNullKeyTest() { - LogbackMDCAdapter lma = new LogbackMDCAdapter(); - lma.remove(null); + mdcAdapter.remove(null); } @Test public void removeInexistentKey() { - LogbackMDCAdapter lma = new LogbackMDCAdapter(); - lma.remove("abcdlw0"); + mdcAdapter.remove("abcdlw0"); } @Test public void sequenceWithGet() { - LogbackMDCAdapter lma = new LogbackMDCAdapter(); - lma.put("k0", "v0"); - Map<String, String> map0 = lma.copyOnInheritThreadLocal.get(); - lma.get("k0"); // point 0 - lma.put("k0", "v1"); + mdcAdapter.put("k0", "v0"); + Map<String, String> map0 = mdcAdapter.copyOnInheritThreadLocal.get(); + mdcAdapter.get("k0"); // point 0 + mdcAdapter.put("k0", "v1"); // verify that map0 is that in point 0 assertEquals("v0", map0.get("k0")); } @Test public void sequenceWithGetPropertyMap() { - LogbackMDCAdapter lma = new LogbackMDCAdapter(); - lma.put("k0", "v0"); - Map<String, String> map0 = lma.getPropertyMap(); // point 0 - lma.put("k0", "v1"); + mdcAdapter.put("k0", "v0"); + Map<String, String> map0 = mdcAdapter.getPropertyMap(); // point 0 + mdcAdapter.put("k0", "v1"); // verify that map0 is that in point 0 assertEquals("v0", map0.get("k0")); } - - class ChildThreadForMDCAdapter extends Thread { - - LogbackMDCAdapter logbackMDCAdapter; - boolean successul; - HashMap<String, String> childHM; - - ChildThreadForMDCAdapter(LogbackMDCAdapter logbackMDCAdapter) { - this.logbackMDCAdapter = logbackMDCAdapter; - } - - @Override - public void run() { - childHM = getHashMapFromMDCAdapter(logbackMDCAdapter); - logbackMDCAdapter.get(""); - successul = true; - } - } - // ================================================= /** @@ -121,18 +97,18 @@ public class LogbackMDCAdapterTest { CountDownLatch countDownLatch = new CountDownLatch(1); String firstKey = "x" + diff; String secondKey = "o" + diff; - MDC.put(firstKey, firstKey + A_SUFFIX); + mdcAdapter.put(firstKey, firstKey + A_SUFFIX); - ChildThreadForMDC childThread = new ChildThreadForMDC(firstKey, secondKey, countDownLatch); + ChildThread childThread = new ChildThread(mdcAdapter, firstKey, secondKey, countDownLatch); childThread.start(); countDownLatch.await(); - MDC.put(firstKey, firstKey + B_SUFFIX); + mdcAdapter.put(firstKey, firstKey + B_SUFFIX); childThread.join(); - assertNull(MDC.get(secondKey)); - assertTrue(childThread.successul); + assertNull(mdcAdapter.get(secondKey)); + assertTrue(childThread.successful); - HashMap<String, String> parentHM = getHashMapFromMDC(); + Map<String, String> parentHM = getMapFromMDCAdapter(mdcAdapter); assertTrue(parentHM != childThread.childHM); HashMap<String, String> parentHMWitness = new HashMap<String, String>(); @@ -152,36 +128,104 @@ public class LogbackMDCAdapterTest { String firstKey = "x" + diff; String secondKey = "o" + diff; - MDC.put(firstKey, firstKey+A_SUFFIX); - assertEquals(firstKey+A_SUFFIX, MDC.get(firstKey)); + mdcAdapter.put(firstKey, firstKey + A_SUFFIX); + assertEquals(firstKey + A_SUFFIX, mdcAdapter.get(firstKey)); - Thread clearer = new ChildThreadForMDC(firstKey, secondKey) { + Thread clearer = new ChildThread(mdcAdapter, firstKey, secondKey) { @Override public void run() { - MDC.clear(); - assertNull(MDC.get(firstKey)); + mdcAdapter.clear(); + assertNull(mdcAdapter.get(firstKey)); } }; clearer.start(); clearer.join(); - assertEquals(firstKey+A_SUFFIX, MDC.get(firstKey)); + assertEquals(firstKey + A_SUFFIX, mdcAdapter.get(firstKey)); } - class ChildThreadForMDC extends Thread { + // see http://jira.qos.ch/browse/LBCLASSIC-289 + // this test used to fail without synchronization code in LogbackMDCAdapter + @Test + public void nearSimultaneousPutsShouldNotCauseConcurrentModificationException() throws InterruptedException { + // For the weirdest reason, modifications to mdcAdapter must be done + // before the definition anonymous ChildThread class below. Otherwise, the + // map in the child thread, the one contained in mdcAdapter.copyOnInheritThreadLocal, + // is null. How strange is that? + + // let the map have lots of elements so that copying it takes time + for (int i = 0; i < 2048; i++) { + mdcAdapter.put("k" + i, "v" + i); + } + + ChildThread childThread = new ChildThread(mdcAdapter, null, null) { + @Override + public void run() { + for (int i = 0; i < 16; i++) { + mdcAdapter.put("ck" + i, "cv" + i); + Thread.yield(); + } + successful = true; + } + }; + + + childThread.start(); + Thread.sleep(1); + for (int i = 0; i < 16; i++) { + mdcAdapter.put("K" + i, "V" + i); + } + childThread.join(); + assertTrue(childThread.successful); + } + + Map<String, String> getMapFromMDCAdapter(LogbackMDCAdapter lma) { + InheritableThreadLocal<Map<String, String>> copyOnInheritThreadLocal = lma.copyOnInheritThreadLocal; + return copyOnInheritThreadLocal.get(); + } + + // ========================== various thread classes + class ChildThreadForMDCAdapter extends Thread { + + LogbackMDCAdapter logbackMDCAdapter; + boolean successul; + Map<String, String> childHM; + + ChildThreadForMDCAdapter(LogbackMDCAdapter logbackMDCAdapter) { + this.logbackMDCAdapter = logbackMDCAdapter; + } + + @Override + public void run() { + childHM = getMapFromMDCAdapter(logbackMDCAdapter); + logbackMDCAdapter.get(""); + successul = true; + } + } + + + class ChildThread extends Thread { + + LogbackMDCAdapter logbackMDCAdapter; String firstKey; String secondKey; - boolean successul; - HashMap<String, String> childHM; + boolean successful; + Map<String, String> childHM; CountDownLatch countDownLatch; - ChildThreadForMDC(String firstKey, String secondKey) { - this(firstKey, secondKey, null); + ChildThread(LogbackMDCAdapter logbackMDCAdapter) { + this(logbackMDCAdapter, null, null); + } + + ChildThread(LogbackMDCAdapter logbackMDCAdapter, String firstKey, String secondKey) { + this(logbackMDCAdapter, firstKey, secondKey, null); } - ChildThreadForMDC(String firstKey, String secondKey, CountDownLatch countDownLatch) { + ChildThread(LogbackMDCAdapter logbackMDCAdapter, String firstKey, String secondKey, CountDownLatch countDownLatch) { + super("chil"); + this.logbackMDCAdapter = logbackMDCAdapter; this.firstKey = firstKey; this.secondKey = secondKey; this.countDownLatch = countDownLatch; @@ -189,24 +233,13 @@ public class LogbackMDCAdapterTest { @Override public void run() { - MDC.put(secondKey, secondKey + A_SUFFIX); - assertNotNull(MDC.get(firstKey)); - assertEquals(firstKey + A_SUFFIX, MDC.get(firstKey)); - if(countDownLatch != null) countDownLatch.countDown(); - assertEquals(secondKey + A_SUFFIX, MDC.get(secondKey)); - successul = true; - childHM = getHashMapFromMDC(); + logbackMDCAdapter.put(secondKey, secondKey + A_SUFFIX); + assertNotNull(logbackMDCAdapter.get(firstKey)); + assertEquals(firstKey + A_SUFFIX, logbackMDCAdapter.get(firstKey)); + if (countDownLatch != null) countDownLatch.countDown(); + assertEquals(secondKey + A_SUFFIX, logbackMDCAdapter.get(secondKey)); + successful = true; + childHM = getMapFromMDCAdapter(logbackMDCAdapter); } } - - HashMap<String, String> getHashMapFromMDCAdapter(LogbackMDCAdapter lma) { - InheritableThreadLocal<HashMap<String, String>> copyOnInheritThreadLocal = lma.copyOnInheritThreadLocal; - return copyOnInheritThreadLocal.get(); - } - - HashMap<String, String> getHashMapFromMDC() { - LogbackMDCAdapter lma = (LogbackMDCAdapter) MDC.getMDCAdapter(); - InheritableThreadLocal<HashMap<String, String>> copyOnInheritThreadLocal = lma.copyOnInheritThreadLocal; - return copyOnInheritThreadLocal.get(); - } } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 2233c5e..7cfd392 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -40,9 +40,12 @@ In the <code>ILoggingEvent</code> interface the <code>getMDC</code> method is now deprecated and replaced by - <code>getMDCPropertyMap</code>. The latter methof was already part + <code>getMDCPropertyMap</code>. The latter method was already part of the <code>ILoggingEvent</code> interface in prior versions of - logback-classic. + logback-classic. Furthermore, the value returned by + <code>ILoggingEvent.getMDCPropertyMap</code> can now be an empty + map but never null. + <code>LoggingEvent</code> no longer assumes that <code>LogbackMDCAdapter</code> is the only possible implementation @@ -51,6 +54,13 @@ reported by Chris Dolan. + <code>LogbackMDCAdapter</code> now synchronizes over its thread + local map. This prevents + <code>ConcurrentModificationException</code> from occuring while a + child thread copies the map from the parent. This fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-289">LBCLASSIC-289</a> + reported by Josh Oddman. + It is now possible to specify multiple destination addresses separated by commas in the the to property of <code>SMTPAppender</code>. This fixes <a @@ -60,7 +70,7 @@ addresses could only be specified by using multiple to properties. As of version 0.9.30 both comma separated addresses and multiple to properties are suported. + class="option">to properties are supported. When debug attribute is set to true within the ----------------------------------------------------------------------- Summary of changes: .../logback/classic/util/LogbackMDCAdapter.java | 37 +++-- .../spi/LoggingEventSerializationPerfTest.java | 2 + .../classic/util/LogbackMDCAdapterTest.java | 181 ++++++++++++-------- logback-site/src/site/pages/news.html | 16 ++- 4 files changed, 144 insertions(+), 92 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-268) ConcurrentModificationException in LogbackMDCAdapter
by Scott Stanton (JIRA) 20 Sep '11

20 Sep '11

ConcurrentModificationException in LogbackMDCAdapter ---------------------------------------------------- Key: LBCLASSIC-268 URL: http://jira.qos.ch/browse/LBCLASSIC-268 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.28 Environment: JRE 1.6.0_25, Windows 7 64-bit Reporter: Scott Stanton Assignee: Logback dev list Priority: Critical I'm seeing ConcurrentModificationException errors like the following: {panel} 011-05-23T04:53:31.997 | ERROR | Dispatch-001 | | | | OperationCaller | null | java.util.ConcurrentModificationException: null at java.util.HashMap$HashIterator.nextEntry(HashMap.java:793) ~[na:1.6.0_21] at java.util.HashMap$EntryIterator.next(HashMap.java:834) ~[na:1.6.0_21] at java.util.HashMap$EntryIterator.next(HashMap.java:832) ~[na:1.6.0_21] at java.util.HashMap.putAll(HashMap.java:523) ~[na:1.6.0_21] at ch.qos.logback.classic.util.LogbackMDCAdapter.put(LogbackMDCAdapter.java:76) ~[logback-classic.jar:na] at org.slf4j.MDC.put(MDC.java:112) ~[slf4j-api.jar:1.6.1] {panel} -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

[JIRA] Created: (LBCLASSIC-267) Intermittent ConcurrentModificationException in LoggingEvent.prepareForDeferredProcessing
by Anders Wallgren (JIRA) 20 Sep '11

20 Sep '11

Intermittent ConcurrentModificationException in LoggingEvent.prepareForDeferredProcessing ----------------------------------------------------------------------------------------- Key: LBCLASSIC-267 URL: http://jira.qos.ch/browse/LBCLASSIC-267 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.28 Reporter: Anders Wallgren Assignee: Logback dev list Occasionally seeing this type of exception: 02:02:27,883 |-ERROR in com.electriccloud.log.AsyncAppender[ASYNC_FILE] - Appender [ASYNC_FILE] failed to append. java.util.ConcurrentModificationExceptionjava.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextEntry(HashMap.java:793) at java.util.HashMap$EntryIterator.next(HashMap.java:834) at java.util.HashMap$EntryIterator.next(HashMap.java:832) at java.util.HashMap.putAllForCreate(HashMap.java:435) at java.util.HashMap.<init>(HashMap.java:225) at ch.qos.logback.classic.spi.LoggingEvent.prepareForDeferredProcessing(LoggingEvent.java:213) at com.electriccloud.log.AsyncAppender.append(AsyncAppender.java:132) at com.electriccloud.log.AsyncAppender.append(AsyncAppender.java:36) at ch.qos.logback.core.AppenderBase.doAppend(AppenderBase.java:85) at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:64) at ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:285) at ch.qos.logback.classic.Logger.callAppenders(Logger.java:272) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:473) at ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:427) at ch.qos.logback.classic.Logger.debug(Logger.java:534) at com.electriccloud.log.Slf4jLog.debug(Slf4jLog.java:66) at com.electriccloud.log.Slf4jLog.log(Slf4jLog.java:202) at com.electriccloud.util.timer.Timer.logElapsed(Timer.java:324) at com.electriccloud.operations.OperationTimingAspect.logOperationPerformance(OperationTimingAspect.java:107) at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:627) at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:616) at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:64) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:160) at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:89) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:171) at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:204) at $Proxy23.perform(Unknown Source) at com.electriccloud.operations.OperationInvoker.invoke(OperationInvoker.java:273) at com.electriccloud.operations.OperationCaller.call(OperationCaller.java:127) at com.electriccloud.operations.OperationCaller.call(OperationCaller.java:42) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:662) at com.electriccloud.util.CommanderThread.run(CommanderThread.java:105) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

Re: [logback-dev] FW: Error building backlog with Maven2
by Ceki Gülcü 20 Sep '11

20 Sep '11

Hi Alaeddine. You can get the file in question from git. See [1]. Anyway, thanks for the heaps up. I just fixed the problem for the next release. [1] https://github.com/ceki/logback/blob/master/logback-classic/integration.xml On 20/09/2011 3:01 PM, Alaeddine HAOUAS wrote: > Hi, > > I ran « mvn install » into the logback-0.9.29 project directory and I > get the following error : > > testAll: > > [INFO] Executed tasks > > [INFO] [antrun:run {execution: ant-integration-test}] > > project.artifactId > > [INFO] Executing tasks > > [INFO] > ------------------------------------------------------------------------ > > [ERROR] BUILD ERROR > > [INFO] > ------------------------------------------------------------------------ > > [INFO] An Ant BuildException has occured: The following error occurred > while executing this line: > > java.io.FileNotFoundException: > C:\Users\AHA\Documents\sources\logback-0.9.29\logback-classic\integration.xml > (Le fichier spÚcifiÚ est introuvable) > > My JDK is 1.6.0_25 and I use Maven 2.2.1. > > Do you have an idea how fixing this ? thx > > Aladdin > >

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-31-g3c983cc
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 3c983ccd0dd39ca006d78a0c086966e99693821c (commit) from 9c732c91bbed4acc059d2242e76ed18ac6e7194b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=3c983ccd0dd39ca006d78a0c… http://github.com/ceki/logback/commit/3c983ccd0dd39ca006d78a0c086966e996938… commit 3c983ccd0dd39ca006d78a0c086966e99693821c Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 20 15:17:20 2011 +0200 added missing file diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml index 215841d..2b1ba6c 100755 --- a/src/main/assembly/dist.xml +++ b/src/main/assembly/dist.xml @@ -24,6 +24,7 @@ <includes> <include>pom.xml</include> <include>osgi-build.xml</include> + <include>integration.xml</include> </includes> <excludes> <exclude>*.bak</exclude> ----------------------------------------------------------------------- Summary of changes: src/main/assembly/dist.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

FW: Error building backlog with Maven2
by Alaeddine HAOUAS 20 Sep '11

20 Sep '11

Hi, I ran « mvn install » into the logback-0.9.29 project directory and I get the following error : testAll: [INFO] Executed tasks [INFO] [antrun:run {execution: ant-integration-test}] project.artifactId [INFO] Executing tasks [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] An Ant BuildException has occured: The following error occurred while executing this line: java.io.FileNotFoundException: C:\Users\AHA\Documents\sources\logback-0.9.29\logback-classic\integration.xm l (Le fichier spÚcifiÚ est introuvable) My JDK is 1.6.0_25 and I use Maven 2.2.1. Do you have an idea how fixing this ? thx Aladdin

1 0

[JIRA] Created: (LBCLASSIC-275) LoggingEvent casts to LogbackMDCAdapter without checking
by Chris Dolan (JIRA) 19 Sep '11

19 Sep '11

LoggingEvent casts to LogbackMDCAdapter without checking -------------------------------------------------------- Key: LBCLASSIC-275 URL: http://jira.qos.ch/browse/LBCLASSIC-275 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.28 Reporter: Chris Dolan Assignee: Logback dev list LoggingEvent has this code: // ugly but under the circumstances acceptable LogbackMDCAdapter logbackMDCAdapter = (LogbackMDCAdapter) MDC .getMDCAdapter(); mdcPropertyMap = logbackMDCAdapter.getPropertyMap(); I'm trying to build a logback implementation of the OSGi pax-logging-service (http://www.ops4j.org/projects/pax/logging/index.html) But I've got a problem that PAX exports org.slf4j.impl with their own MDC adapter that fails this cast. Theirs has the nice feature that the OSGi bundle context is automatically added to the MDC (at a performance cost, alas). I'd like to see LoggingEvent changed to something like the following for improved flexibility: MDCAdapter mdc = MDC.getMDCAdapter(); if (MDCAdaptor instanceof LogbackMDCAdapter) mdcPropertyMap = ((LogbackMDCAdapter)mdc).getPropertyMap(); else mdcPropertyMap = mdc.getCopyOfContextMap(); -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 6

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-30-g9c732c9
by git-noreply＠pixie.qos.ch 19 Sep '11

19 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 9c732c91bbed4acc059d2242e76ed18ac6e7194b (commit) via 904ba967f62651a3ae1163d18303afe412a7102c (commit) via 082d5df90dc5e5a7181998134f59582274e53000 (commit) via 1d001fc4640fc42b3bb1a34eafe492d62f55c17b (commit) via 2ac4ee863fc4d3c74439a91a0d327e2aaf93543a (commit) from 513fb2d00fecf03dc8bc561f9cdc2e49bc0d80df (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=9c732c91bbed4acc059d2242… http://github.com/ceki/logback/commit/9c732c91bbed4acc059d2242e76ed18ac6e71… commit 9c732c91bbed4acc059d2242e76ed18ac6e7194b Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Sep 19 13:16:13 2011 +0200 disallow empty values to be returned by ILoggingEvent#getMDCPropertyMap diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java index 4b169bd..ce64e2f 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ILoggingEvent.java @@ -70,7 +70,7 @@ public interface ILoggingEvent extends DeferredProcessingAware { public Marker getMarker(); /** - * Returns the MDC map. + * Returns the MDC map. The returned value can be an empty map but not null. */ public Map<String, String> getMDCPropertyMap(); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index 59dcf09..9581dc1 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@ -25,6 +25,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.util.LogbackMDCAdapter; +import org.slf4j.spi.MDCAdapter; /** * The internal representation of logging events. When an affirmative decision @@ -205,11 +206,7 @@ public class LoggingEvent implements ILoggingEvent { this.getFormattedMessage(); this.getThreadName(); // fixes http://jira.qos.ch/browse/LBCLASSIC-104 - if (mdcPropertyMap == null) { - mdcPropertyMap = MDC.getCopyOfContextMap(); - if (mdcPropertyMap == null) - mdcPropertyMap = CACHED_NULL_MAP; - } + this.getMDCPropertyMap(); } public LoggerContextVO getLoggerContextVO() { @@ -307,17 +304,19 @@ public class LoggingEvent implements ILoggingEvent { } public Map<String, String> getMDCPropertyMap() { + // populate mdcPropertyMap if null if (mdcPropertyMap == null) { MDCAdapter mdc = MDC.getMDCAdapter(); if (mdc instanceof LogbackMDCAdapter) - return ((LogbackMDCAdapter)mdc).getPropertyMap(); - else { + mdcPropertyMap = ((LogbackMDCAdapter)mdc).getPropertyMap(); + else mdcPropertyMap = mdc.getCopyOfContextMap(); - if (mdcPropertyMap == null) - mdcPropertyMap = CACHED_NULL_MAP; - } } - return mdcPropertyMap == CACHED_NULL_MAP ? null : mdcPropertyMap; + // mdcPropertyMap still null, use CACHED_NULL_MAP + if (mdcPropertyMap == null) + mdcPropertyMap = CACHED_NULL_MAP; + + return mdcPropertyMap; } /** diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index bfaa7de..02e5ba7 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -265,7 +265,7 @@ public class JaninoEventEvaluatorTest { @Test public void nullMDC() throws EvaluationException { MDC.clear(); - jee.setExpression("mdc == null"); + jee.setExpression("mdc.isEmpty()"); jee.start(); LoggingEvent event = makeLoggingEvent(null); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java index 395f542..edd0013 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java @@ -25,6 +25,8 @@ import org.junit.Test; import org.slf4j.MDC; +import java.util.HashMap; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -71,7 +73,7 @@ public class MDCBasedDiscriminatorTest { @Test public void nullMDC() { event = new LoggingEvent("a", logger, Level.DEBUG, "", null, null); - assertNull(event.getMdc()); + assertEquals(new HashMap(), event.getMDCPropertyMap()); String discriminatorValue = discriminator.getDiscriminatingValue(event); assertEquals(DEFAULT_VAL, discriminatorValue); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java index e3f62c6..f759df2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java @@ -100,7 +100,7 @@ public class LoggingEventSerializationPerfTest { long averageSize = (long) (noos.size() / (LOOP_LEN)); System.out.println("noos size " + noos.size() + " average size=" + averageSize); - double averageSizeLimit = 60; + double averageSizeLimit = 62.1; assertTrue("average size " + averageSize + " should be less than " + averageSizeLimit, averageSizeLimit > averageSize); diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index bb931b7..0e67022 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -479,9 +479,9 @@ public class SampleFilter extends Filter>ILoggingEvent> { <td><code>Map</code></td> <td>A map containing all the MDC values at the time of the creation of the logging event. A value can be accessed by - using the following expression: mdc.get("myKey"). The - 'mdc' variable can be null and this possibility should be - checked for in evaluator expressions. + using the following expression: mdc.get("myKey"). As + of logback-classic version 0.9.30, the 'mdc' variable will + never be null. The <code>java.util.Map</code> type is non-parameterized because Janino does not support generics. It follows that the diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 97ae9ad..2233c5e 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -44,6 +44,13 @@ of the <code>ILoggingEvent</code> interface in prior versions of logback-classic. + <code>LoggingEvent</code> no longer assumes that + <code>LogbackMDCAdapter</code> is the only possible implementation + of the <code>MDCAdapter</code> interface. This fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-275">LBCLASSIC-275</a> + reported by Chris Dolan. + + It is now possible to specify multiple destination addresses separated by commas in the the to property of <code>SMTPAppender</code>. This fixes <a http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=904ba967f62651a3ae1163d1… http://github.com/ceki/logback/commit/904ba967f62651a3ae1163d18303afe412a71… commit 904ba967f62651a3ae1163d18303afe412a7102c Merge: 513fb2d 082d5df Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Sep 19 03:03:31 2011 -0700 Merge pull request #17 from chrisdolan/master LBCLASSIC-275 - LoggingEvent casts to LogbackMDCAdapter without checking diff --cc logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index c2a0e1b,141ed3f..59dcf09 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@@ -309,15 -307,21 +307,25 @@@ public class LoggingEvent implements IL } public Map<String, String> getMDCPropertyMap() { - return mdcPropertyMap; + if (mdcPropertyMap == null) { + MDCAdapter mdc = MDC.getMDCAdapter(); + if (mdc instanceof LogbackMDCAdapter) + return ((LogbackMDCAdapter)mdc).getPropertyMap(); + else { + mdcPropertyMap = mdc.getCopyOfContextMap(); + if (mdcPropertyMap == null) + mdcPropertyMap = CACHED_NULL_MAP; + } + } + return mdcPropertyMap == CACHED_NULL_MAP ? null : mdcPropertyMap; } + /** + * Synonym for [@link #getMDCPropertyMap}. + * @deprecated Replaced by [@link #getMDCPropertyMap} + */ public Map<String, String> getMdc() { - return mdcPropertyMap; + return getMDCPropertyMap(); } @Override http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=082d5df90dc5e5a718199813… http://github.com/ceki/logback/commit/082d5df90dc5e5a7181998134f59582274e53… commit 082d5df90dc5e5a7181998134f59582274e53000 Author: Chris Dolan <chris(a)chrisdolan.net> Date: Mon Jun 13 14:29:50 2011 -0500 proper handling of null MDC in LoggingEvent caching diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index 6090f02..141ed3f 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@ -89,6 +89,7 @@ public class LoggingEvent implements ILoggingEvent { private Marker marker; private Map<String, String> mdcPropertyMap; + private static final Map<String, String> CACHED_NULL_MAP = new HashMap<String, String>(); /** * The number of milliseconds elapsed from 1/1/1970 until logging event was @@ -206,6 +207,8 @@ public class LoggingEvent implements ILoggingEvent { // fixes http://jira.qos.ch/browse/LBCLASSIC-104 if (mdcPropertyMap == null) { mdcPropertyMap = MDC.getCopyOfContextMap(); + if (mdcPropertyMap == null) + mdcPropertyMap = CACHED_NULL_MAP; } } @@ -308,10 +311,13 @@ public class LoggingEvent implements ILoggingEvent { MDCAdapter mdc = MDC.getMDCAdapter(); if (mdc instanceof LogbackMDCAdapter) return ((LogbackMDCAdapter)mdc).getPropertyMap(); - else + else { mdcPropertyMap = mdc.getCopyOfContextMap(); + if (mdcPropertyMap == null) + mdcPropertyMap = CACHED_NULL_MAP; + } } - return mdcPropertyMap; + return mdcPropertyMap == CACHED_NULL_MAP ? null : mdcPropertyMap; } public Map<String, String> getMdc() { http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=1d001fc4640fc42b3bb1a34e… http://github.com/ceki/logback/commit/1d001fc4640fc42b3bb1a34eafe492d62f55c… commit 1d001fc4640fc42b3bb1a34eafe492d62f55c17b Author: Chris Dolan <chris(a)chrisdolan.net> Date: Mon Jun 13 14:15:30 2011 -0500 fix typo: mdcPropertyMap != null should have been mdcPropertyMap == null diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index c792217..6090f02 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@ -204,7 +204,7 @@ public class LoggingEvent implements ILoggingEvent { this.getFormattedMessage(); this.getThreadName(); // fixes http://jira.qos.ch/browse/LBCLASSIC-104 - if (mdcPropertyMap != null) { + if (mdcPropertyMap == null) { mdcPropertyMap = MDC.getCopyOfContextMap(); } } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2ac4ee863fc4d3c74439a91a… http://github.com/ceki/logback/commit/2ac4ee863fc4d3c74439a91a0d327e2aaf935… commit 2ac4ee863fc4d3c74439a91a0d327e2aaf93543a Author: Chris Dolan <chris(a)chrisdolan.net> Date: Mon Jun 13 09:34:05 2011 -0500 http://jira.qos.ch/browse/LBCLASSIC-275 - LoggingEvent casts to LogbackMDCAdapter without checking Implementation of the proposal in the first comment of that issue: defer reading the MDC until as late as possible diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index d68e448..c792217 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@ -128,11 +128,6 @@ public class LoggingEvent implements ILoggingEvent { } timeStamp = System.currentTimeMillis(); - - // ugly but under the circumstances acceptable - LogbackMDCAdapter logbackMDCAdapter = (LogbackMDCAdapter) MDC - .getMDCAdapter(); - mdcPropertyMap = logbackMDCAdapter.getPropertyMap(); } public void setArgumentArray(Object[] argArray) { @@ -210,7 +205,7 @@ public class LoggingEvent implements ILoggingEvent { this.getThreadName(); // fixes http://jira.qos.ch/browse/LBCLASSIC-104 if (mdcPropertyMap != null) { - mdcPropertyMap = new HashMap<String, String>(mdcPropertyMap); + mdcPropertyMap = MDC.getCopyOfContextMap(); } } @@ -309,11 +304,18 @@ public class LoggingEvent implements ILoggingEvent { } public Map<String, String> getMDCPropertyMap() { + if (mdcPropertyMap == null) { + MDCAdapter mdc = MDC.getMDCAdapter(); + if (mdc instanceof LogbackMDCAdapter) + return ((LogbackMDCAdapter)mdc).getPropertyMap(); + else + mdcPropertyMap = mdc.getCopyOfContextMap(); + } return mdcPropertyMap; } public Map<String, String> getMdc() { - return mdcPropertyMap; + return getMDCPropertyMap(); } @Override ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/classic/spi/ILoggingEvent.java | 2 +- .../ch/qos/logback/classic/spi/LoggingEvent.java | 25 ++++++++++++------- .../classic/boolex/JaninoEventEvaluatorTest.java | 2 +- .../classic/sift/MDCBasedDiscriminatorTest.java | 4 ++- .../spi/LoggingEventSerializationPerfTest.java | 2 +- logback-site/src/site/pages/manual/filters.html | 6 ++-- logback-site/src/site/pages/news.html | 7 +++++ 7 files changed, 32 insertions(+), 16 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0