December 2011 - logback-dev

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-55-g0fe93ab
by git-noreply＠pixie.qos.ch 21 Dec '11

21 Dec '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 0fe93ab52a11545a7f88fd367d4777d14c733606 (commit) from fef529f87d72e94a582e5cd515c7acaddf01e07e (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=0fe93ab52a11545a7f88fd36… http://github.com/ceki/logback/commit/0fe93ab52a11545a7f88fd367d4777d14c733… commit 0fe93ab52a11545a7f88fd367d4777d14c733606 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 20 19:41:28 2011 +0100 Added support for multiple %d tokens in FileNamePattern diff --git a/logback-classic/src/test/resources/TWO_DATE_logback-test.xml b/logback-classic/src/test/resources/TWO_DATE_logback-test.xml new file mode 100644 index 0000000..d2c3444 --- /dev/null +++ b/logback-classic/src/test/resources/TWO_DATE_logback-test.xml @@ -0,0 +1,21 @@ +<configuration> + <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener"/> + + <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>test.log</file> + + + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> +  + <fileNamePattern>bla-%d{yyyy-MM-dd, SECONDARY}/app.%d{yyyy-MM-dd'T'HH_mm}.log</fileNamePattern> + </rollingPolicy> + + <encoder> + <pattern>%d{"yyyy-MM-dd HH:mm:ss,SSS"} [%thread] %-5level %logger{36} - %msg%n%xEx</pattern> + </encoder> + </appender> + + <root level="DEBUG"> + <appender-ref ref="FILE"/> + </root> +</configuration> \ No newline at end of file diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java index b1690ad..b5a05da 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java @@ -41,7 +41,7 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends } public void start() { - DateTokenConverter dtc = tbrp.fileNamePattern.getDateTokenConverter(); + DateTokenConverter dtc = tbrp.fileNamePattern.getPrimaryDateTokenConverter(); if (dtc == null) { throw new IllegalStateException("FileNamePattern [" + tbrp.fileNamePattern.getPattern() 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 582336d..5225d56 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 @@ -14,6 +14,7 @@ package ch.qos.logback.core.rolling.helper; import java.util.Date; +import java.util.List; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.pattern.DynamicConverter; @@ -30,16 +31,27 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy * The conversion word/character with which this converter is registered. */ public final static String CONVERTER_KEY = "d"; + public final static String SECONDARY_TOKEN = "SECONDARY"; public static final String DEFAULT_DATE_PATTERN = CoreConstants.DAILY_DATE_PATTERN; private String datePattern; private CachingDateFormatter cdf; - + // is this token converter primary or secondary? Only the primary converter + // determines the rolling period + private boolean secondary = false; public void start() { this.datePattern = getFirstOption(); if (this.datePattern == null) { this.datePattern = DEFAULT_DATE_PATTERN; } + + final List<String> optionList = getOptionList(); + if(optionList != null && optionList.size()> 1) { + String secondOption = optionList.get(1); + if(SECONDARY_TOKEN.equalsIgnoreCase(secondOption)) { + secondary = true; + } + } cdf = new CachingDateFormatter(datePattern); } @@ -72,4 +84,8 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy DatePatternToRegexUtil toRegex = new DatePatternToRegexUtil(datePattern); return toRegex.toRegex(); } + + public boolean isPrimary() { + return !secondary; + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java index 85b494a..8253844 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java @@ -75,7 +75,7 @@ abstract public class DefaultArchiveRemover extends ContextAwareBase implements abstract void cleanByPeriodOffset(Date now, int periodOffset); boolean computeParentCleaningFlag(FileNamePattern fileNamePattern) { - DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); + DateTokenConverter dtc = fileNamePattern.getPrimaryDateTokenConverter(); // if the date pattern has a /, then we need parent cleaning if (dtc.getDatePattern().indexOf('/') != -1) { return true; diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java index 67f207b..dab1a72 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java @@ -81,12 +81,15 @@ public class FileNamePattern extends ContextAwareBase { return pattern; } - public DateTokenConverter getDateTokenConverter() { + public DateTokenConverter getPrimaryDateTokenConverter() { Converter p = headTokenConverter; while (p != null) { if (p instanceof DateTokenConverter) { - return (DateTokenConverter) p; + DateTokenConverter dtc = (DateTokenConverter) p; + // only primary converters should be returned as + if(dtc.isPrimary()) + return dtc; } p = p.getNext(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java new file mode 100644 index 0000000..7d574a4 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java @@ -0,0 +1,68 @@ +package ch.qos.logback.core.rolling; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import org.junit.Before; +import org.junit.Test; + +import java.util.logging.Logger; + +import static org.junit.Assert.assertEquals; + +/** + * @author Ceki Gücü + */ +public class TimeBasedFileNamingAndTriggeringPolicyBaseTest { + + static long MILLIS_IN_MINUTE = 60*1000; + + Context context = new ContextBase(); + RollingFileAppender rfa = new RollingFileAppender(); + TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); + DefaultTimeBasedFileNamingAndTriggeringPolicy timeBasedFNATP = new DefaultTimeBasedFileNamingAndTriggeringPolicy(); + + @Before + public void setUp() { + rfa.setContext(context); + tbrp.setContext(context); + timeBasedFNATP.setContext(context); + + rfa.setRollingPolicy(tbrp); + tbrp.setParent(rfa); + tbrp.setTimeBasedFileNamingAndTriggeringPolicy(timeBasedFNATP); + timeBasedFNATP.setTimeBasedRollingPolicy(tbrp); + } + + @Test + public void singleDate() { + // Tuesday December 20th 17:59:01 CET 2011 + long startTime = 1324400341553L; + tbrp.setFileNamePattern("foo-%d{yyyy-MM'T'mm}.log"); + tbrp.start(); + + timeBasedFNATP.setCurrentTime(startTime); + timeBasedFNATP.start(); + + timeBasedFNATP.setCurrentTime(startTime+MILLIS_IN_MINUTE); + timeBasedFNATP.isTriggeringEvent(null, null); + String elapsedPeriodsFileName = timeBasedFNATP.getElapsedPeriodsFileName(); + assertEquals("foo-2011-12T59.log", elapsedPeriodsFileName); + } + +@Test + public void multiDate() { + // Tuesday December 20th 17:59:01 CET 2011 + long startTime = 1324400341553L; + tbrp.setFileNamePattern("foo-%d{yyyy-MM, SECONDARY}/%d{mm}.log"); + tbrp.start(); + + timeBasedFNATP.setCurrentTime(startTime); + timeBasedFNATP.start(); + + timeBasedFNATP.setCurrentTime(startTime+MILLIS_IN_MINUTE); + timeBasedFNATP.isTriggeringEvent(null, null); + String elapsedPeriodsFileName = timeBasedFNATP.getElapsedPeriodsFileName(); + assertEquals("foo-2011-12/59.log", elapsedPeriodsFileName); + } + +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java index 7f069cf..8a35f15 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertEquals; import java.util.Calendar; +import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; import ch.qos.logback.core.Context; @@ -139,4 +140,13 @@ public class FileNamePatternTest { assertEquals("foo-\\d{4}\\.\\d{2}\\.\\d{2}T-\\d{1,2}.txt", regex); } } + + @Test + public void convertMultipleDates() { + Calendar cal = Calendar.getInstance(); + cal.set(2003, 4, 20, 17, 55); + FileNamePattern fnp = new FileNamePattern("foo-%d{yyyy.MM, SECONDARY}/%d{yyyy.MM.dd}.txt", context); + assertEquals("foo2003.05/2003.05.20.txt", fnp.convert(cal.getTime())); + + } } ----------------------------------------------------------------------- Summary of changes: .../src/test/resources/TWO_DATE_logback-test.xml | 21 ++++++ ...TimeBasedFileNamingAndTriggeringPolicyBase.java | 2 +- .../core/rolling/helper/DateTokenConverter.java | 18 +++++- .../core/rolling/helper/DefaultArchiveRemover.java | 2 +- .../core/rolling/helper/FileNamePattern.java | 7 ++- ...BasedFileNamingAndTriggeringPolicyBaseTest.java | 68 ++++++++++++++++++++ .../core/rolling/helper/FileNamePatternTest.java | 10 +++ 7 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 logback-classic/src/test/resources/TWO_DATE_logback-test.xml create mode 100644 logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

3 2

[JIRA] Created: (LBCLASSIC-298) improve RollingCalendar and TimeBasedFileNamingAndTriggeringPolicyBase to enable periodic loggic
by Murali Rath (JIRA) 20 Dec '11

20 Dec '11

improve RollingCalendar and TimeBasedFileNamingAndTriggeringPolicyBase to enable periodic loggic ------------------------------------------------------------------------------------------------ Key: LBCLASSIC-298 URL: http://jira.qos.ch/browse/LBCLASSIC-298 Project: logback-classic Issue Type: New Feature Components: appender Affects Versions: 0.9.29 Environment: all Reporter: Murali Rath Assignee: Logback dev list logback currently allows logging periodically however it is limited to every 1 sec, 1 min, 1 hr , 1 day etc. When I want the log file to roll over say every 10 sec or 20 minutes it is not possible. RollingCalendar and TimeBasedFileNamingAndTriggeringPolicyBase can be improved or extened to provide this 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

1 3

Developing a listener to rolling events
by Yair Ogen 19 Dec '11

19 Dec '11

Hi, I am thinking of developing a listener for rolling events. The listener will enable users access to the rolling appender and will allow them to append logging events prior to any other event on the new file. This will be similar to " http://www.simonsite.org.uk/javadoc/org/apache/log4j/appender/FileRollEvent…" developed by Simon Park for log4j. Any objections? Do we have anything similar today? Thanks, Yair

1 0

[JIRA] Created: (LBCORE-241) Set the logback to rollover new files every x minutes
by moo mik ki (JIRA) 16 Dec '11

16 Dec '11

Set the logback to rollover new files every x minutes ----------------------------------------------------- Key: LBCORE-241 URL: http://jira.qos.ch/browse/LBCORE-241 Project: logback-core Issue Type: Improvement Components: Rolling Affects Versions: 0.9.21 Reporter: moo mik ki Assignee: Logback dev list Dear dev, I tried one of the solutions here .periodictimebasedfilenamingandtrigerringpolicy but its not working. I tried to include it in my system which the requirements requires me to create new log file every 5 minutes. Please help me with my university project. thank you. xml : <?xml version="1.0" encoding="UTF-8" ?> <configuration scan="true" scanPeriod="60 seconds"> <appender name="my_appender" class="ch.qos.logback.core.rolling.RollingFileAppender"> <File>F:/Logs/Server.log</File> <encoder> <Pattern>Server[%d{ISO8601}][%p] - %m%n</Pattern> </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>F:/Logs/Server-%d{yyyy-MM-dd_HH-mm-ss}.log</FileNamePattern> </rollingPolicy> <triggeringPolicy class="ch.qos.logback.core.rolling.PeriodicTimeBasedFileNamingAndTriggeringPolicy"> <period>600</period> </triggeringPolicy> </appender> <logger name="com.mypackage.application" level="debug" additivity="false"> <appender-ref ref="my_appender" /> </logger> </configuration> -- 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

[JIRA] Created: (LBCLASSIC-314) caller should accept a full or short depth
by Pierre-Luc Charette (JIRA) 12 Dec '11

12 Dec '11

caller should accept a full or short depth ------------------------------------------ Key: LBCLASSIC-314 URL: http://jira.qos.ch/browse/LBCLASSIC-314 Project: logback-classic Issue Type: Improvement Components: layout Affects Versions: 1.0.0 Reporter: Pierre-Luc Charette Assignee: Logback dev list Priority: Trivial The caller converter should accept a depth of full or short like the exception converter. For now, the caller can only accept an integer as its depth. -- 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

[JIRA] Created: (LBCLASSIC-284) Make it possible to log to different appenders at different levels from the same logger
by Iwein Fuld (JIRA) 10 Dec '11

10 Dec '11

Make it possible to log to different appenders at different levels from the same logger --------------------------------------------------------------------------------------- Key: LBCLASSIC-284 URL: http://jira.qos.ch/browse/LBCLASSIC-284 Project: logback-classic Issue Type: Improvement Affects Versions: 0.9.28 Reporter: Iwein Fuld Assignee: Logback dev list I found a requirement in the wild to log trace and above statements to one appender, and debug and above to another. This needed to be configured for a particular package. My preferred solution would be to use something like https://gist.github.com/1104145, but that doesn't work. There is a workaround of using a filter inside the appender, but that isn't as pretty as I would like. ( http://iweinfuld.posterous.com/ ) -- 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

[JIRA] Created: (LBCLASSIC-313) Load properties from xml
by Pierre-Luc Charette (JIRA) 08 Dec '11

08 Dec '11

Load properties from xml ------------------------ Key: LBCLASSIC-313 URL: http://jira.qos.ch/browse/LBCLASSIC-313 Project: logback-classic Issue Type: New Feature Components: joran Affects Versions: 1.0.0 Reporter: Pierre-Luc Charette Assignee: Logback dev list There is no way to load a properties file in xml. There could be a a xmlFile attribute used to call java.util.Properties.loadFromXML like file does for Properties.load. -- 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

[JIRA] Created: (LBCORE-240) from with pattern in SMTPAppender
by Pierre-Luc Charette (JIRA) 08 Dec '11

08 Dec '11

from with pattern in SMTPAppender --------------------------------- Key: LBCORE-240 URL: http://jira.qos.ch/browse/LBCORE-240 Project: logback-core Issue Type: Improvement Components: Appender Affects Versions: 1.0.0 Reporter: Pierre-Luc Charette Assignee: Logback dev list Priority: Minor It would be useful to put a pattern in the from address of the SMTPAppender. For example, if you have, like me, a multi-user login and you want to know the complete name of the person logged in, you need to wait after the login to fill a MDC property with it. I could also put the right user email in the field after login. -- 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

[JIRA] Created: (LBCLASSIC-311) Facade method for configuration by xml: Programmatic configuration should be a single line
by Geoffrey De Smet (JIRA) 04 Dec '11

04 Dec '11

Facade method for configuration by xml: Programmatic configuration should be a single line ------------------------------------------------------------------------------------------ Key: LBCLASSIC-311 URL: http://jira.qos.ch/browse/LBCLASSIC-311 Project: logback-classic Issue Type: New Feature Components: joran Affects Versions: 1.0.0 Reporter: Geoffrey De Smet Assignee: Logback dev list >From a user's perspective, it doesn't a bit overkill to copy paste all this stuff: {code} LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); try { JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(context); // Call context.reset() to clear any previous configuration, e.g. default // configuration. For multi-step configuration, omit calling context.reset(). context.reset(); configurator.doConfigure(getClass.getResource("/com/domain/project/logback.xml")); } catch (JoranException je) { // StatusPrinter will handle this } StatusPrinter.printInCaseOfErrorsOrWarnings(context); {code} It would be nicer if we had a simple static facade method, on JoranConfigurator or LoggerContext, that does all that stuff: {code} JoranConfigurator.configure(getClass.getResource("/com/domain/project/logback.xml")); {code} We shouldn't need to understand the internals and the lifecycle of the JoranConfigurator. -- 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

[JIRA] Created: (LBCLASSIC-310) ReconfigureOnChangeFilter should re-use substition properties from initial configuration
by Gunnar Wagenknecht (JIRA) 02 Dec '11

02 Dec '11

ReconfigureOnChangeFilter should re-use substition properties from initial configuration ---------------------------------------------------------------------------------------- Key: LBCLASSIC-310 URL: http://jira.qos.ch/browse/LBCLASSIC-310 Project: logback-classic Issue Type: Improvement Components: joran Affects Versions: 0.9.27 Reporter: Gunnar Wagenknecht Assignee: Logback dev list Logback configuration files are automatically reloaded when {{scan="true"}} is set. This is implemented using {{ReconfigureOnChangeFilter}}. The actually re-configuration happens in {{ReconfiguringThread}} which always creates a new default {{JoranConfigurator}}. This is works as long as the initial {{JoranConfigurator}} hasn't been extended to support additional substitution properties. {code:java} // create our customized configurator final JoranConfigurator configurator = new JoranConfigurator() { @Override protected void addImplicitRules(final Interpreter interpreter) { super.addImplicitRules(interpreter); // set some properties for log file substitution if (null != instanceLogfileDirectory) { interpreter.getInterpretationContext().addSubstitutionProperty("my.property", calculateMyPropertyValue()); } } }; {code} It should somehow be possible to inherit the custom substitution properties into the new {{JoranConfigurator}}. Otherwise they are lost on re-configuration. -- 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