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 a442a1734057dc241273ad244695f20a67483aea (commit) via eef137b0c6ca92cd4f4ca3e5bb3387bb2d5a42df (commit) via ca14a1c2bd8d7c248ec60d24b4122ee07e2dbc3d (commit) via 379c40573e208b2c5bf52c7ed25dc7e55f52eb80 (commit) via 516d7f5faca20df0de597916b7929eefa5ee053a (commit) from ce19ada3e6bb9aafbc8eccae93898e04de29e8ee (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=a442a1734057dc241273ad244... http://github.com/ceki/logback/commit/a442a1734057dc241273ad244695f20a67483a... commit a442a1734057dc241273ad244695f20a67483aea Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Sep 28 22:26:40 2011 +0200 - Merge changes from lbcore224 branch. Essentially AppenderAttachableImpl now uses CopyOnWriteArrayList instead of ReadWriteLock. diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava new file mode 100644 index 0000000..72e99e9 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava @@ -0,0 +1,53 @@ +package ch.qos.logback.classic.issue.lbcore224; + +import org.apache.zookeeper.test.QuorumUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + + +// This test requires zookeeper 3.4.0 built from SVN trunk and setting +// "build.test.dir" system property + +// recommended logback-test.xml file contents for this test: +<configuration> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>lbcore224.log</file> + <encoder> + <pattern>%logger{35} - %msg%n</pattern> + </encoder> + </appender> + + <root> + <level value="INFO" /> + <appender-ref ref="FILE" /> + </root> +</configuration> + + +public class WithZookeperTest { + static final String BUILT_TEST_DIR_PROP_KEY = "build.test.dir"; + QuorumUtil qU; + + @Before + public void before() { + System.setProperty(BUILT_TEST_DIR_PROP_KEY, "/tmp/zoo"); + qU = new QuorumUtil(1); + } + + @After + public void after() throws Exception { + qU.tearDown(); + System.clearProperty(BUILT_TEST_DIR_PROP_KEY); + } + + @Test + public void shouldNotThrowIllegalMonitorStateException () throws Exception { + for (int i = 0; i < 10; i++) { + qU.startQuorum(); + qU.shutdownAll(); + System.out.println("iteration "+i); + } + } +} diff --git a/logback-classic/src/test/resources/logback-test.xml b/logback-classic/src/test/resources/logback-test.xml deleted file mode 100644 index 2c54715..0000000 --- a/logback-classic/src/test/resources/logback-test.xml +++ /dev/null @@ -1,17 +0,0 @@ -<configuration> - - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>lbcore224.log</file> - <encoder> - <pattern>%logger{35} - %msg%n</pattern> - </encoder> - </appender> - - - - <root> - <level value="INFO" /> - <appender-ref ref="FILE" /> - </root> -</configuration> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 20 +++ .../issue/lbclassic135/LoggingRunnable.java | 21 ++- .../logback/classic/issue/lbcore224/Reduce.java | 160 ++++++++++++++++++++ .../classic/issue/lbcore224/WithZookeperTest._ava | 53 +++++++ .../classic/issue/lbcore224/WithZookeperTest.java | 37 +++++ .../logback/core/spi/AppenderAttachableImpl.java | 104 ++++--------- .../logback/core/rolling/RollingScaffolding.scala | 1 - 7 files changed, 318 insertions(+), 78 deletions(-) create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/Reduce.java create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.