- logback-dev - mailman3.qos.ch

[JIRA] Created: (LBCORE-203) TimeBasedRollingPolicy with MinIndex and MaxIndex attributes
by Muyen Lee (JIRA) 06 Apr '11

06 Apr '11

TimeBasedRollingPolicy with MinIndex and MaxIndex attributes ------------------------------------------------------------ Key: LBCORE-203 URL: http://jira.qos.ch/browse/LBCORE-203 Project: logback-core Issue Type: Improvement Components: Rolling Affects Versions: 0.9.28 Reporter: Muyen Lee Assignee: Logback dev list Priority: Minor Issue LBCORE-16 didn't really solve the problem. The MaxHistory can specified how many days logs get deleted but it is still possible to create too many index files in a day. Therefore, it is better to have a maxIndex attributes as well. -- 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

1 0

CRLF line endings in source repository
by Tomasz Nurkiewicz 30 Mar '11

30 Mar '11

Hi! I noticed couple of files have Windows (CRLF) line endings in official repository on GitHub, namely: $ find . -iname "*.java" -exec file {} \; | grep CRLF ./logback-examples/src/main/java/chapters/architecture/SelectionRule.java: ASCII Java program text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/T_Entry.java: ASCII English text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/LRUCache.java: ASCII English text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/T_LRUCache.java: ASCII English text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/Event.java: ASCII English text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/Simulator.java: ASCII English text, with CRLF line terminators ./logback-classic/src/test/java/ch/qos/logback/classic/turbo/lru/LRUCacheTest.java: ASCII English text, with CRLF line terminators ./logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java: ASCII English text, with CRLF line terminators ./logback-core/src/main/java/ch/qos/logback/core/pattern/parser/SimpleKeywordNode.java: ASCII English text, with CRLF line terminators These files are marked as modified immediately after cloning fresh copy of the repository (all lines modified). I am using Ubuntu 10.10, Git 1.7.1, core.autocrlf=input. Can somebody please fix EOLs to LF in the files above and push the changes? It causes me a headache when trying to merge with official repo as I am not very fammiliar with Git. Thanks in advance! -- Tomasz Nurkiewicz http://nurkiewicz.blogspot.com

2 2

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-37-ge4aa27e
by git-noreply＠pixie.qos.ch 29 Mar '11

29 Mar '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 e4aa27eb1dae6b6278ab139444d769edf1280411 (commit) from 0bc69a589371a02911e156c0f792231928cb40a8 (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=e4aa27eb1dae6b6278ab1394… http://github.com/ceki/logback/commit/e4aa27eb1dae6b6278ab139444d769edf1280… commit e4aa27eb1dae6b6278ab139444d769edf1280411 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 29 23:00:32 2011 +0200 refactored millesecond cached formatting code into CachingDateFormatter diff --git a/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java b/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java index 10de74a..10e7776 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java +++ b/logback-access/src/main/java/ch/qos/logback/access/pattern/DateConverter.java @@ -13,21 +13,18 @@ */ package ch.qos.logback.access.pattern; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.TimeZone; import ch.qos.logback.access.spi.IAccessEvent; import ch.qos.logback.core.CoreConstants; - +import ch.qos.logback.core.util.CachingDateFormatter; public class DateConverter extends AccessConverter { - long lastTimestamp = -1; - String timesmapStr = null; - SimpleDateFormat simpleFormat = null; + + CachingDateFormatter cachingDateFormatter = null; public void start() { @@ -41,13 +38,13 @@ public class DateConverter extends AccessConverter { } try { - simpleFormat = new SimpleDateFormat(datePattern); + cachingDateFormatter = new CachingDateFormatter(datePattern); //maximumCacheValidity = CachedDateFormat.getMaximumCacheValidity(pattern); } catch (IllegalArgumentException e) { addWarn( "Could not instantiate SimpleDateFormat with pattern " + datePattern, e); // default to the ISO8601 format - simpleFormat = new SimpleDateFormat(CoreConstants.CLF_DATE_PATTERN); + cachingDateFormatter = new CachingDateFormatter(CoreConstants.CLF_DATE_PATTERN); } List optionList = getOptionList(); @@ -55,23 +52,13 @@ public class DateConverter extends AccessConverter { // if the option list contains a TZ option, then set it. if (optionList != null && optionList.size() > 1) { TimeZone tz = TimeZone.getTimeZone((String) optionList.get(1)); - simpleFormat.setTimeZone(tz); + cachingDateFormatter.setTimeZone(tz); } } public String convert(IAccessEvent accessEvent) { - long timestamp = accessEvent.getTimeStamp(); - - // if called multiple times within the same millisecond - // return old value - if(timestamp == lastTimestamp) { - return timesmapStr; - } else { - lastTimestamp = timestamp; - timesmapStr = simpleFormat.format(new Date(timestamp)); - return timesmapStr; - } + return cachingDateFormatter.format(timestamp); } } diff --git a/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java b/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java index c71f1e6..19c940a 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java @@ -63,7 +63,7 @@ public class ConverterTest { DateConverter converter = new DateConverter(); converter.start(); String result = converter.convert(event); - assertEquals(converter.simpleFormat.format(event.getTimeStamp()), result); + assertEquals(converter.cachingDateFormatter.format(event.getTimeStamp()), result); } public void testLineLocalPortConverter() { diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 7a32396..8eae411 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -357,6 +357,7 @@ org.xml.*;resolution:=optional, org.slf4j, ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, + ch.qos.logback.core.util, org.codehaus.groovy.*;resolution:=optional, groovy.lang.*;resolution:=optional, * diff --git a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy index 8193d52..54cc685 100644 --- a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy +++ b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy @@ -30,7 +30,8 @@ import java.text.SimpleDateFormat import ch.qos.logback.classic.turbo.TurboFilter import ch.qos.logback.core.CoreConstants import ch.qos.logback.core.util.ContextUtil -import ch.qos.logback.core.joran.action.TimestampAction; +import ch.qos.logback.core.joran.action.TimestampAction +import ch.qos.logback.core.util.CachingDateFormatter; /** * @author Ceki Gücü @@ -158,17 +159,17 @@ public class ConfigurationDelegate extends ContextAwareBase { } String timestamp(String datePattern, long timeReference = -1) { - Date reference = null; + long now = -1; if(timeReference == -1) { addInfo("Using current interpretation time, i.e. now, as time reference."); - reference = new Date() + now = System.currentTimeMillis() } else { - reference = new Date(timeReference) - addInfo("Using " + reference +" as time reference."); + now = timeReference + addInfo("Using " + now +" as time reference."); } - SimpleDateFormat sdf = new SimpleDateFormat(datePattern); - sdf.format(reference) + CachingDateFormatter sdf = new CachingDateFormatter(datePattern); + sdf.format(now) } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java index 4f0a449..9b9cfaf 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java @@ -20,12 +20,13 @@ import java.util.TimeZone; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.util.CachingDateFormatter; public class DateConverter extends ClassicConverter { long lastTimestamp = -1; String timestampStrCache = null; - SimpleDateFormat simpleFormat = null; + CachingDateFormatter cachingDateFormatter = null; public void start() { @@ -40,14 +41,14 @@ public class DateConverter extends ClassicConverter { } try { - simpleFormat = new SimpleDateFormat(datePattern); + cachingDateFormatter = new CachingDateFormatter(datePattern); // maximumCacheValidity = // CachedDateFormat.getMaximumCacheValidity(pattern); } catch (IllegalArgumentException e) { addWarn("Could not instantiate SimpleDateFormat with pattern " + datePattern, e); // default to the ISO8601 format - simpleFormat = new SimpleDateFormat(CoreConstants.ISO8601_PATTERN); + cachingDateFormatter = new CachingDateFormatter(CoreConstants.ISO8601_PATTERN); } List optionList = getOptionList(); @@ -55,25 +56,12 @@ public class DateConverter extends ClassicConverter { // if the option list contains a TZ option, then set it. if (optionList != null && optionList.size() > 1) { TimeZone tz = TimeZone.getTimeZone((String) optionList.get(1)); - simpleFormat.setTimeZone(tz); + cachingDateFormatter.setTimeZone(tz); } } public String convert(ILoggingEvent le) { long timestamp = le.getTimeStamp(); - - synchronized (this) { - // if called multiple times within the same millisecond - // return cache value - if (timestamp == lastTimestamp) { - return timestampStrCache; - } else { - lastTimestamp = timestamp; - // SimpleDateFormat is not thread safe. - // See also http://jira.qos.ch/browse/LBCLASSIC-36 - timestampStrCache = simpleFormat.format(new Date(timestamp)); - return timestampStrCache; - } - } + return cachingDateFormatter.format(timestamp); } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 9119aa0..10de840 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -23,6 +23,7 @@ import ch.qos.logback.classic.jul.JULHelper; import ch.qos.logback.core.pattern.parser.Parser; import ch.qos.logback.core.pattern.parser.ScanException; import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.util.CachingDateFormatter; import ch.qos.logback.core.util.StatusPrinter; import org.junit.Ignore; import org.junit.Test; @@ -315,8 +316,8 @@ public class JoranConfiguratorTest { String r = loggerContext.getProperty("testTimestamp"); assertNotNull(r); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); - String expected = sdf.format(new Date()); + CachingDateFormatter sdf = new CachingDateFormatter("yyyy-MM"); + String expected = sdf.format(System.currentTimeMillis()); assertEquals("expected \"" + expected + "\" but got " + r, expected, r); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java index 18907b6..26cba84 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertTrue; import java.text.SimpleDateFormat; import java.util.Date; +import ch.qos.logback.core.util.CachingDateFormatter; import org.junit.Test; import ch.qos.logback.classic.ClassicTestConstants; @@ -51,8 +52,8 @@ public class UniqueFileTest { @Test public void basic() throws Exception { loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "unique.xml"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss"); - String timestamp = sdf.format(new Date()); + CachingDateFormatter sdf = new CachingDateFormatter("yyyyMMdd'T'HHmmss"); + String timestamp = sdf.format(System.currentTimeMillis()); StatusChecker sc = new StatusChecker(lc); assertTrue(sc.isErrorFree()); diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 03383ed..24671f3 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -85,12 +85,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <optional>true</optional> - </dependency> - </dependencies> diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java index d252773..992f4f8 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java @@ -16,6 +16,7 @@ package ch.qos.logback.core.joran.action; import java.text.SimpleDateFormat; import java.util.Date; +import ch.qos.logback.core.util.CachingDateFormatter; import org.xml.sax.Attributes; import ch.qos.logback.core.joran.spi.ActionException; @@ -53,12 +54,12 @@ public class TimestampAction extends Action { } String timeReferenceStr = attributes.getValue(TIME_REFERENCE_ATTRIBUTE); - Date timeReference = null; + long timeReference = -1; if (CONTEXT_BIRTH.equalsIgnoreCase(timeReferenceStr)) { addInfo("Using context birth as time reference."); - timeReference = new Date(context.getBirthTime()); + timeReference = context.getBirthTime(); } else { - timeReference = new Date(); + timeReference = System.currentTimeMillis(); addInfo("Using current interpretation time, i.e. now, as time reference."); } @@ -66,7 +67,7 @@ public class TimestampAction extends Action { if (inError) return; - SimpleDateFormat sdf = new SimpleDateFormat(datePatternStr); + CachingDateFormatter sdf = new CachingDateFormatter(datePatternStr); String val = sdf.format(timeReference); addInfo("Adding property to the context with key=\"" + keyStr diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java index 3c7a82d..4ef5e2f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java @@ -18,6 +18,7 @@ import java.util.Date; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.pattern.DynamicConverter; +import ch.qos.logback.core.util.CachingDateFormatter; /** * Returns a date formatted by SimpleDateFormatter. @@ -33,7 +34,7 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy public static final String DEFAULT_DATE_PATTERN = CoreConstants.DAILY_DATE_PATTERN; private String datePattern; - private SimpleDateFormat sdf; + private CachingDateFormatter cdf; public DateTokenConverter() { } @@ -43,11 +44,11 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy if (this.datePattern == null) { this.datePattern = DEFAULT_DATE_PATTERN; } - sdf = new SimpleDateFormat(datePattern); + cdf = new CachingDateFormatter(datePattern); } public String convert(Date date) { - return sdf.format(date); + return cdf.format(date.getTime()); } public String convert(Object o) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java index fc3f6a0..9009280 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java @@ -28,11 +28,12 @@ import javax.servlet.http.HttpServletResponse; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.helpers.Transform; +import ch.qos.logback.core.util.CachingDateFormatter; abstract public class ViewStatusMessagesServletBase extends HttpServlet { private static final long serialVersionUID = -3551928133801157219L; - private static SimpleDateFormat SDF = new SimpleDateFormat( + private static CachingDateFormatter SDF = new CachingDateFormatter( "yyyy-MM-dd HH:mm:ss"); static String SUBMIT = "submit"; diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java b/logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java new file mode 100644 index 0000000..028c596 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java @@ -0,0 +1,45 @@ +package ch.qos.logback.core.util; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +/** + * A synchronized implementation of SimpleDateFormat which uses caching internally. + * + * @author Ceki Gücü + * @since 0.9.29 + */ +public class CachingDateFormatter { + + + long lastTimestamp = -1; + String cachedStr = null; + final SimpleDateFormat sdf; + + public CachingDateFormatter(String pattern) { + sdf = new SimpleDateFormat(pattern); + } + + public final String format(long now) { + + // SimpleDateFormat is not thread safe. + + // See also the discussion in http://jira.qos.ch/browse/LBCLASSIC-36 + // DateFormattingThreadedThroughputCalculator and SelectiveDateFormattingRunnable + // are also note worthy + + // The now == lastTimestamp guard minimizes synchronization + synchronized (this) { + if (now != lastTimestamp) { + lastTimestamp = now; + cachedStr = sdf.format(new Date(now)); + } + return cachedStr; + } + } + + public void setTimeZone(TimeZone tz) { + sdf.setTimeZone(tz); + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java b/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java index 79afa8d..ad8a4e2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java @@ -14,8 +14,6 @@ package ch.qos.logback.core.util; import java.io.PrintStream; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.Iterator; import java.util.List; @@ -30,7 +28,7 @@ public class StatusPrinter { private static PrintStream ps = System.out; - static SimpleDateFormat simpleDateFormat = new SimpleDateFormat( + static CachingDateFormatter cachingDateFormat = new CachingDateFormatter( "HH:mm:ss,SSS"); public static void setPrintStream(PrintStream printStream) { @@ -151,9 +149,8 @@ public class StatusPrinter { prefix = indentation + "|-"; } - if (simpleDateFormat != null) { - Date date = new Date(s.getDate()); - String dateStr = simpleDateFormat.format(date); + if (cachingDateFormat != null) { + String dateStr = cachingDateFormat.format(s.getDate()); sb.append(dateStr).append(" "); } sb.append(prefix).append(s).append(CoreConstants.LINE_SEPARATOR); 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 deleted file mode 100644 index 94b4399..0000000 --- a/logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package ch.qos.logback.core.time; - -import ch.qos.logback.core.contention.RunnableWithCounterAndDone; -import ch.qos.logback.core.contention.ThreadedThroughputCalculator; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; -import org.junit.Ignore; -import org.junit.Test; - -import java.text.SimpleDateFormat; -import java.util.Date; - - -public class DateFormattingThroughputTest { - - - ThreadedThroughputCalculator t; - - static int THREAD_COUNT = 30; - static long OVERALL_DURATION_IN_MILLIS = 2000; - - static String PATTERN = "yyyy-MM-dd'T'HH:mm:ss"; - - @Test - public void sdf() throws InterruptedException { - ThreadedThroughputCalculator tp = new ThreadedThroughputCalculator( - OVERALL_DURATION_IN_MILLIS); - - SimpleDateFormat sdf = new SimpleDateFormat(PATTERN); - RunnableWithCounterAndDone[] sdfRunnables = buildSDFRunnables(sdf); - tp.execute(sdfRunnables); - tp.printThroughput("SDF with synchronization: ", false); - } - - RunnableWithCounterAndDone[] buildSDFRunnables(SimpleDateFormat sdf) { - RunnableWithCounterAndDone[] runnables = new RunnableWithCounterAndDone[THREAD_COUNT]; - for (int i = 0; i < THREAD_COUNT; i++) { - runnables[i] = new SDFRunnabable(sdf); - } - return runnables; - } - - @Test - public void yoda() throws InterruptedException { - ThreadedThroughputCalculator tp = new ThreadedThroughputCalculator( - OVERALL_DURATION_IN_MILLIS); - - DateTimeFormatter fmt = DateTimeFormat.forPattern(PATTERN); - RunnableWithCounterAndDone[] yodaRunnables = buildYodaRunnables(fmt); - tp.execute(yodaRunnables); - tp.printThroughput("Yoda: ", false); - } - - RunnableWithCounterAndDone[] buildYodaRunnables(DateTimeFormatter fmt) { - RunnableWithCounterAndDone[] runnables = new RunnableWithCounterAndDone[THREAD_COUNT]; - for (int i = 0; i < THREAD_COUNT; i++) { - runnables[i] = new YodaTimeRunnable(fmt); - } - return runnables; - } - - - class SDFRunnabable extends RunnableWithCounterAndDone { - - SimpleDateFormat sdf; - long lasttime = -1; - - SDFRunnabable(SimpleDateFormat sdf) { - this.sdf = sdf; - } - - public void run() { - while (!done) { - counter++; - long now = System.currentTimeMillis(); - if (now == lasttime) { - - } else { - lasttime = now; - synchronized (sdf) { - sdf.format(new Date()); - } - } - } - } - } - - class YodaTimeRunnable extends RunnableWithCounterAndDone { - - DateTimeFormatter yodaDTFt; - long lasttime = -1; - - YodaTimeRunnable(DateTimeFormatter dtf) { - this.yodaDTFt = dtf; - } - - public void run() { - while (!done) { - 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/RollingScaffolding.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala index 6b68d2d..905530b 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala @@ -14,15 +14,15 @@ package ch.qos.logback.core.rolling import ch.qos.logback.core.{ContextBase, Context} -import ch.qos.logback.core.util.CoreTestConstants import ch.qos.logback.core.testUtil.RandomUtil import java.util.{Date, Calendar} import java.util.concurrent.TimeUnit import java.text.SimpleDateFormat +import ch.qos.logback.core.util.{CachingDateFormatter, CoreTestConstants} trait RollingScaffolding { final val DATE_PATTERN_WITH_SECONDS = "yyyy-MM-dd_HH_mm_ss" - final val SDF = new SimpleDateFormat(DATE_PATTERN_WITH_SECONDS) + final val SDF = new CachingDateFormatter(DATE_PATTERN_WITH_SECONDS) private[rolling] var context: Context = new ContextBase private[rolling] var diff: Int = RandomUtil.getPositiveInt protected var currentTime: Long = 0L @@ -52,7 +52,7 @@ trait RollingScaffolding { } protected def addExpectedFileName_ByDate(outputDir: String, testId: String, date: Date, gzExtension: Boolean): Unit = { - var fn: String = outputDir + testId + "-" + SDF.format(date) + var fn: String = outputDir + testId + "-" + SDF.format(date.getTime) if (gzExtension) { fn += ".gz" } diff --git a/pom.xml b/pom.xml index 6a30698..514ea01 100755 --- a/pom.xml +++ b/pom.xml @@ -167,12 +167,6 @@ <version>${scala.version}</version> </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>1.6.2</version> - </dependency> - </dependencies> </dependencyManagement> ----------------------------------------------------------------------- Summary of changes: .../qos/logback/access/pattern/DateConverter.java | 27 ++---- .../qos/logback/access/pattern/ConverterTest.java | 2 +- logback-classic/pom.xml | 1 + .../classic/gaffer/ConfigurationDelegate.groovy | 15 ++-- .../qos/logback/classic/pattern/DateConverter.java | 24 +--- .../classic/joran/JoranConfiguratorTest.java | 5 +- .../logback/classic/rolling/UniqueFileTest.java | 5 +- logback-core/pom.xml | 6 - .../logback/core/joran/action/TimestampAction.java | 9 +- .../core/rolling/helper/DateTokenConverter.java | 7 +- .../core/status/ViewStatusMessagesServletBase.java | 3 +- .../logback/core/util/CachingDateFormatter.java | 45 ++++++++ .../ch/qos/logback/core/util/StatusPrinter.java | 9 +- .../core/time/DateFormattingThroughputTest.java | 110 -------------------- .../logback/core/rolling/RollingScaffolding.scala | 6 +- pom.xml | 6 - 16 files changed, 91 insertions(+), 189 deletions(-) create mode 100644 logback-core/src/main/java/ch/qos/logback/core/util/CachingDateFormatter.java delete mode 100644 logback-core/src/test/java/ch/qos/logback/core/time/DateFormattingThroughputTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-202) Shutdown hook to close logger context
by Tuomas Kiviaho (JIRA) 29 Mar '11

29 Mar '11

Shutdown hook to close logger context ------------------------------------- Key: LBCORE-202 URL: http://jira.qos.ch/browse/LBCORE-202 Project: logback-core Issue Type: Improvement Components: Other Affects Versions: 0.9.27 Reporter: Tuomas Kiviaho Assignee: Logback dev list I'm using header and footer with my file appender and would like footers to be present in file when processes exit (JUnit tests mainly). I figured out a to achieve this by using status listeners and logger context (presented below) combined with shutdown hook. This is something that logback jar could probably in one form or another (spring framework for instance has similar feature for their context). public class ShutdownHookStatusListener extends ContextAwareBase implements StatusListener, LifeCycle { private Thread shutdownHook; @Override public void addStatusEvent(Status status) { } @Override public boolean isStarted() { return this.shutdownHook != null; } @Override public void start() { if (!this.isStarted()) { this.shutdownHook = new Thread() { @Override public void run() { LoggerContext loggerContext = (LoggerContext) LoggerFactory .getILoggerFactory(); loggerContext.stop(); } }; Runtime runtime = Runtime.getRuntime(); runtime.addShutdownHook(this.shutdownHook); } } @Override public void stop() { if (this.isStarted()) { Runtime runtime = Runtime.getRuntime(); runtime.removeShutdownHook(this.shutdownHook); this.shutdownHook = null; } } } -- 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

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-36-g0bc69a5
by git-noreply＠pixie.qos.ch 28 Mar '11

28 Mar '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 0bc69a589371a02911e156c0f792231928cb40a8 (commit) from 427f9bffcf5c603a0e0ee647fa54507068acb7f4 (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=0bc69a589371a02911e156c0… http://github.com/ceki/logback/commit/0bc69a589371a02911e156c0f792231928cb4… commit 0bc69a589371a02911e156c0f792231928cb40a8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 28 22:49:31 2011 +0200 typo fix diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index a2941f9..928f35b 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -63,7 +63,7 @@ The AccessEvent class in logback-access module now implements the IAccessEvent interface. This fixes <a href="http://jira.qos.ch/browse/LBACCESS-12">LBACCESS-12</a> - reported by Joen Huxhorn. + reported by Joern Huxhorn. <hr width="80%" align="center" /> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-257) Please add c'tor LoggerContextVO(String name, Map<String, String> propertyMap, long birthTime) to ch.qos.logback.classic.spi.LoggerContextVO
by Joern Huxhorn (JIRA) 28 Mar '11

28 Mar '11

Please add c'tor LoggerContextVO(String name, Map<String,String> propertyMap, long birthTime) to ch.qos.logback.classic.spi.LoggerContextVO ------------------------------------------------------------------------------------------------------------------------------------------- Key: LBCLASSIC-257 URL: http://jira.qos.ch/browse/LBCLASSIC-257 Project: logback-classic Issue Type: Improvement Affects Versions: 0.9.29 Reporter: Joern Huxhorn Assignee: Logback dev list I'm stuck recreating a Logback classic logging event since I'm unable to create a LoggerContextVO from plain data. Please add the following c'tor to LoggerContextVO: public LoggerContextVO(String name, Map<String,String> propertyMap, long birthTime) { this.name = name; this.propertyMap = propertyMap; this.birthTime = birthTime; } This is the only thing that prevents me from fully supporting cat/tail of Lilith Logging events using Logback formatters. See https://github.com/huxi/lilith/blob/master/lilith/src/main/java/de/huxhorn/… -- 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 2

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-35-g427f9bf
by git-noreply＠pixie.qos.ch 28 Mar '11

28 Mar '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 427f9bffcf5c603a0e0ee647fa54507068acb7f4 (commit) from d12e774a989e9045d9ce7065151b0d80a16eafef (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=427f9bffcf5c603a0e0ee647… http://github.com/ceki/logback/commit/427f9bffcf5c603a0e0ee647fa54507068acb… commit 427f9bffcf5c603a0e0ee647fa54507068acb7f4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 28 22:45:47 2011 +0200 update the list of fixed bugs diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 13d7670..a2941f9 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -59,6 +59,11 @@ href="http://jira.qos.ch/browse/LBCLASSIC-255">LBCLASSIC-255</a> by César Álvarez Núñez. + + The AccessEvent class in logback-access module now implements + the IAccessEvent interface. This fixes <a + href="http://jira.qos.ch/browse/LBACCESS-12">LBACCESS-12</a> + reported by Joen Huxhorn. <hr width="80%" align="center" /> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBACCESS-12) Please add IAccessEvent (and AccessEventVO) similar to the LoggingEvent counterparts
by Joern Huxhorn (JIRA) 28 Mar '11

28 Mar '11

Please add IAccessEvent (and AccessEventVO) similar to the LoggingEvent counterparts ------------------------------------------------------------------------------------ Key: LBACCESS-12 URL: http://jira.qos.ch/browse/LBACCESS-12 Project: logback-access Issue Type: Improvement Affects Versions: 0.9.20 Reporter: Joern Huxhorn Assignee: Logback dev list I'm currently implementing "cat" functionality for Lilith data files, i.e. events stored in Lilith data files can be printed using ch.qos.logback.classic.PatternLayout and ch.qos.logback.access.PatternLayout. This works for LoggingEvent since I could implement a iLoggingEvent wrapper for my own LoggingEvent. It does not work for AccessEvent, though, because there is no IAccessEvent interface and I can't instantiate AccessEvent and set the properties manually. ch.qos.logback.access.PatternLayout is currently working on an AccessEvent and I'd like to use it's functionality. -- 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

[JIRA] Created: (LBCLASSIC-156) SocketAppender is reporting an WARN if connection could not be established.
by Joern Huxhorn (JIRA) 28 Mar '11

28 Mar '11

SocketAppender is reporting an WARN if connection could not be established. --------------------------------------------------------------------------- Key: LBCLASSIC-156 URL: http://jira.qos.ch/browse/LBCLASSIC-156 Project: logback-classic Issue Type: Improvement Components: appender Affects Versions: 0.917 Environment: java version "1.6.0_15" Java(TM) SE Runtime Environment (build 1.6.0_15-b03-226) Java HotSpot(TM) 64-Bit Server VM (build 14.1-b02-92, mixed mode) Reporter: Joern Huxhorn Assignee: Logback dev list This is a followup to LBCLASSIC-143 which changed the message from ERROR to WARN. The WARN message still results in a dump of the logging status messages. This means that a whole bunch of text is printed to the console whenever Lilith is started - and it looks quite broken due to the stacktrace. So there are two possible solutions for this problem: a) the status is only printed in case of an ERROR b) SocketAppender considers this as an INFO instead of a WARN. I think b) would be reasonable. Other WARNs are much more important, like duplicate logback.xml. Lilith is only an example, btw. We routinely add SocketAppender[localhost] to our console applications. In case of trouble one can simply start Lilith and check the logs that way instead of reading them on the console. The default use-case is executing the app without Lilith, though, so we get the logback status messages on every start - which is quite noisy and annoying. -- 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 5

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-34-gd12e774
by git-noreply＠pixie.qos.ch 28 Mar '11

28 Mar '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 d12e774a989e9045d9ce7065151b0d80a16eafef (commit) from 56fe8a84fb7a07a0f842318409d61285ebcc4ff9 (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=d12e774a989e9045d9ce7065… http://github.com/ceki/logback/commit/d12e774a989e9045d9ce7065151b0d80a16ea… commit d12e774a989e9045d9ce7065151b0d80a16eafef Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 28 22:38:06 2011 +0200 Fix LBCLASSIC-156 diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java index 842b9d8..6b2fb5c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java @@ -136,7 +136,7 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { msg += " We will try again later."; fireConnector(); // fire the connector thread } - addWarn(msg, e); + addInfo(msg, e); } } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/core/net/SocketAppenderBase.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0