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 291d3efbed616b1c62b2ba465cf727fc99ddda70 (commit) via f62521f7f7549c8d3a03b421ea4aa288bbffda36 (commit) via 8fa4596a4c7b813e94138983a0504ca638673280 (commit) from ebb58bb6ea3816a4e4ffd805b722c8121bba61a6 (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=291d3efbed616b1c62b2ba465... http://github.com/ceki/logback/commit/291d3efbed616b1c62b2ba465cf727fc99ddda... commit 291d3efbed616b1c62b2ba465cf727fc99ddda70 Merge: f62521f ebb58bb Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Mar 28 21:41:57 2011 +0200 Merge branch 'master' of git.qos.ch:logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=f62521f7f7549c8d3a03b421e... http://github.com/ceki/logback/commit/f62521f7f7549c8d3a03b421ea4aa288bbffda... commit f62521f7f7549c8d3a03b421ea4aa288bbffda36 Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Mar 28 21:40:50 2011 +0200 ongoing work on Dateformatting diff --git a/logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java b/logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java index 624390d..94b4399 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java @@ -11,7 +11,6 @@ import java.text.SimpleDateFormat; import java.util.Date; -@Ignore public class DateFormattingThroughputTest { @@ -30,7 +29,7 @@ public class DateFormattingThroughputTest { SimpleDateFormat sdf = new SimpleDateFormat(PATTERN); RunnableWithCounterAndDone[] sdfRunnables = buildSDFRunnables(sdf); tp.execute(sdfRunnables); - tp.printThroughput("SDF with synchronization: ", true); + tp.printThroughput("SDF with synchronization: ", false); } RunnableWithCounterAndDone[] buildSDFRunnables(SimpleDateFormat sdf) { @@ -49,7 +48,7 @@ public class DateFormattingThroughputTest { DateTimeFormatter fmt = DateTimeFormat.forPattern(PATTERN); RunnableWithCounterAndDone[] yodaRunnables = buildYodaRunnables(fmt); tp.execute(yodaRunnables); - tp.printThroughput("Yoda: ", true); + tp.printThroughput("Yoda: ", false); } RunnableWithCounterAndDone[] buildYodaRunnables(DateTimeFormatter fmt) { @@ -64,6 +63,7 @@ public class DateFormattingThroughputTest { class SDFRunnabable extends RunnableWithCounterAndDone { SimpleDateFormat sdf; + long lasttime = -1; SDFRunnabable(SimpleDateFormat sdf) { this.sdf = sdf; @@ -71,10 +71,16 @@ public class DateFormattingThroughputTest { public void run() { while (!done) { - synchronized (sdf) { - sdf.format(new Date()); - } counter++; + long now = System.currentTimeMillis(); + if (now == lasttime) { + + } else { + lasttime = now; + synchronized (sdf) { + sdf.format(new Date()); + } + } } } } @@ -82,6 +88,7 @@ public class DateFormattingThroughputTest { class YodaTimeRunnable extends RunnableWithCounterAndDone { DateTimeFormatter yodaDTFt; + long lasttime = -1; YodaTimeRunnable(DateTimeFormatter dtf) { this.yodaDTFt = dtf; @@ -89,9 +96,13 @@ public class DateFormattingThroughputTest { public void run() { while (!done) { - long now = System.currentTimeMillis(); - yodaDTFt.print(now); counter++; + long now = System.currentTimeMillis(); + if (now == lasttime) { + } else { + lasttime = now; + yodaDTFt.print(now); + } } } } diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/LBCORE_199.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/LBCORE_199.scala index fc7ea2a..8dcb859 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/LBCORE_199.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/LBCORE_199.scala @@ -38,7 +38,7 @@ class LBCORE_199 extends RollingScaffolding { def smoke() { println("ba") initRFA("toto.log") - fwrp.setFileNamePattern("tests.%i.log.gz") + fwrp.setFileNamePattern("tests.%i.log.zip") fwrp.minIndex = 1 fwrp.maxIndex = 3 fwrp.setParent(rfa) http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8fa4596a4c7b813e94138983a... http://github.com/ceki/logback/commit/8fa4596a4c7b813e94138983a0504ca6386732... commit 8fa4596a4c7b813e94138983a0504ca638673280 Author: Joern Huxhorn <jhuxhorn@googlemail.com> Date: Mon Mar 28 12:37:17 2011 +0200 Fixes LBCLASSIC-257. Added additional c'tor to LoggerContextVO. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java index d2c2e36..0230da2 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java @@ -47,6 +47,12 @@ public class LoggerContextVO implements Serializable { this.birthTime = lc.getBirthTime(); } + public LoggerContextVO(String name, Map<String,String> propertyMap, long birthTime) { + this.name = name; + this.propertyMap = propertyMap; + this.birthTime = birthTime; + } + public String getName() { return name; } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/classic/spi/LoggerContextVO.java | 6 ++++ .../core/time/DateFormattingThroughputTest.java | 27 ++++++++++++++------ .../ch/qos/logback/core/rolling/LBCORE_199.scala | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.