The branch, master has been updated via 5f017a3925a5262e25c522011348174421cfd3bb (commit) from 5f3d8faef0e61cd653ba30d2fa20c3bd7d0ba5ed (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=5f017a3925a5262e25c522011... http://github.com/ceki/logback/commit/5f017a3925a5262e25c522011348174421cfd3... commit 5f017a3925a5262e25c522011348174421cfd3bb Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Dec 3 18:07:14 2009 +0100 final touches on the LBCLASSIC-154 fix diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java index fe36372..cd04f93 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java @@ -26,6 +26,7 @@ import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.FilterReply; +import ch.qos.logback.core.status.InfoStatus; /** * Reconfigure a LoggerContext when the configuration file changes. @@ -170,6 +171,8 @@ public class ReconfigureOnChangeFilter extends TurboFilter { } catch (JoranException e) { addError("Failure during reconfiguration", e); } + lc.getStatusManager().add( + new InfoStatus("done resetting the logging context", this)); } } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java index e4165b9..4538c89 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java @@ -34,7 +34,7 @@ import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.testUtil.Env; public class ReconfigurePerf { - final static int THREAD_COUNT = 5; + final static int THREAD_COUNT = 50; final static int LOOP_LEN = 1000 * 1000; // the space in the file name mandated by diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index c5cb13d..ec8a6ab 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -94,6 +94,12 @@ href="http://jira.qos.ch/browse/LBCLASSIC-102">LBCLASSIC-102</a> and as reported by Joern Huxhorn.</p> + <p>Fixed deadlock issue observed with appender which invoke + loggers as reported in <a + href="http://jira.qos.ch/browse/LBCLASSIC-154">LBCLASSIC-154</a> + by Andrew Perrine and debugged by Ralph Goers who also proposed + the relevant patch.</p> + <hr width="80%" align="center" /> <h3>9th of August 2009 - Release of version 0.9.17</h3> ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeFilter.java | 3 +++ .../qos/logback/classic/turbo/ReconfigurePerf.java | 2 +- logback-site/src/site/pages/news.html | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.