March 2012 - logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-6-g9445460
by git-noreply＠pixie.qos.ch 09 Mar '12

09 Mar '12

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 94454601b654d4de8f836c27d192fed7613e7cf3 (commit) from 2cd6af6e7f10570999fae4c8c03b70aa7b1d407f (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=94454601b654d4de8f836c27… http://github.com/ceki/logback/commit/94454601b654d4de8f836c27d192fed7613e7… commit 94454601b654d4de8f836c27d192fed7613e7cf3 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Mar 9 18:43:42 2012 +0100 intentional compilation failure diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java index eaccd55..b68b76d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java @@ -19,6 +19,8 @@ import ch.qos.logback.core.encoder.LayoutWrappingEncoder; public class PatternLayoutEncoderBase<E> extends LayoutWrappingEncoder<E> { String pattern; + + for reasons of consistency following attribute should be removed protected boolean outputPatternAsPresentationHeader = true; public String getPattern() { ----------------------------------------------------------------------- Summary of changes: .../core/pattern/PatternLayoutEncoderBase.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-5-g2cd6af6
by git-noreply＠pixie.qos.ch 09 Mar '12

09 Mar '12

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 2cd6af6e7f10570999fae4c8c03b70aa7b1d407f (commit) from 38089b6999db113907a8978b229f823bcf552211 (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=2cd6af6e7f10570999fae4c8… http://github.com/ceki/logback/commit/2cd6af6e7f10570999fae4c8c03b70aa7b1d4… commit 2cd6af6e7f10570999fae4c8c03b70aa7b1d407f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Mar 9 18:36:54 2012 +0100 Continued work on LBCORE-234. Have tests pass. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java b/logback-classic/src/main/java/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java index a4f1c1f..5bf4705 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/encoder/PatternLayoutEncoder.java @@ -24,6 +24,7 @@ public class PatternLayoutEncoder extends PatternLayoutEncoderBase<ILoggingEvent PatternLayout patternLayout = new PatternLayout(); patternLayout.setContext(context); patternLayout.setPattern(getPattern()); + patternLayout.setOutputPatternAsPresentationHeader(outputPatternAsPresentationHeader); patternLayout.start(); this.layout = patternLayout; super.start(); diff --git a/logback-classic/src/test/input/joran/rolling/basic.xml b/logback-classic/src/test/input/joran/rolling/basic.xml index 5e4902a..e756f08 100644 --- a/logback-classic/src/test/input/joran/rolling/basic.xml +++ b/logback-classic/src/test/input/joran/rolling/basic.xml @@ -11,6 +11,7 @@ </rollingPolicy> <encoder> <Pattern>%msg%n</Pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> </encoder> </appender> diff --git a/logback-classic/src/test/input/joran/rolling/timeAndSize.xml b/logback-classic/src/test/input/joran/rolling/timeAndSize.xml index f50cd03..b42b04e 100644 --- a/logback-classic/src/test/input/joran/rolling/timeAndSize.xml +++ b/logback-classic/src/test/input/joran/rolling/timeAndSize.xml @@ -15,6 +15,7 @@ </rollingPolicy> <encoder> <Pattern>%msg%n</Pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> </encoder> </appender> diff --git a/logback-classic/src/test/input/joran/smtp/customBufferSize.xml b/logback-classic/src/test/input/joran/smtp/customBufferSize.xml index 233bc77..65bda73 100644 --- a/logback-classic/src/test/input/joran/smtp/customBufferSize.xml +++ b/logback-classic/src/test/input/joran/smtp/customBufferSize.xml @@ -8,11 +8,12 @@ <Subject>%logger - %m</Subject> <CyclicBufferTracker class="ch.qos.logback.core.spi.CyclicBufferTrackerImpl"> - <BufferSize>1</BufferSize> + <bufferSize>1</bufferSize> </CyclicBufferTracker> <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%message</Pattern> + <pattern>%message</pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> </layout> </appender> diff --git a/logback-classic/src/test/input/joran/smtp/customEvaluator.xml b/logback-classic/src/test/input/joran/smtp/customEvaluator.xml index 32d83a4..f5405da 100644 --- a/logback-classic/src/test/input/joran/smtp/customEvaluator.xml +++ b/logback-classic/src/test/input/joran/smtp/customEvaluator.xml @@ -11,6 +11,7 @@ </evaluator> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%message</Pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> </layout> </appender> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java index 6b5dd47..89f9b7a 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/encoder/PatternLayoutEncoderTest.java @@ -39,6 +39,7 @@ public class PatternLayoutEncoderTest { @Before public void setUp() { ple.setPattern("%m"); + ple.setOutputPatternAsPresentationHeader(false); ple.setContext(context); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java index fe0a6ba..71a15b8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java @@ -90,6 +90,7 @@ public class SMTPAppender_GreenTest { PatternLayout layout = new PatternLayout(); layout.setContext(lc); layout.setFileHeader(HEADER); + layout.setOutputPatternAsPresentationHeader(false); layout.setPattern("%-4relative %mdc [%thread] %-5level %class - %msg%n"); layout.setFileFooter(FOOTER); layout.start(); diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java index 6ce3241..1dee67a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java @@ -34,10 +34,7 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { Map<String, String> instanceConverterMap = new HashMap<String, String>(); - - - - boolean forceEmptyPresentationHeader = false; + protected boolean outputPatternAsPresentationHeader = true; /** * Concrete implementations of this class are responsible for elaborating the @@ -147,19 +144,20 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { return CoreConstants.EMPTY_STRING; } - public boolean isForceEmptyPresentationHeader() { - return forceEmptyPresentationHeader; + public boolean isOutputPatternAsPresentationHeader() { + return outputPatternAsPresentationHeader; } - public void setForceEmptyPresentationHeader(boolean forceEmptyPresentationHeader) { - this.forceEmptyPresentationHeader = forceEmptyPresentationHeader; + public void setOutputPatternAsPresentationHeader(boolean outputPatternAsPresentationHeader) { + this.outputPatternAsPresentationHeader = outputPatternAsPresentationHeader; } @Override public String getPresentationHeader() { - if(forceEmptyPresentationHeader) - return null; - else + if(outputPatternAsPresentationHeader) return getPresentationHeaderPrefix()+pattern; + else + return super.getPresentationHeader(); + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java index 8b0d63e..eaccd55 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutEncoderBase.java @@ -19,6 +19,7 @@ import ch.qos.logback.core.encoder.LayoutWrappingEncoder; public class PatternLayoutEncoderBase<E> extends LayoutWrappingEncoder<E> { String pattern; + protected boolean outputPatternAsPresentationHeader = true; public String getPattern() { return pattern; @@ -28,6 +29,14 @@ public class PatternLayoutEncoderBase<E> extends LayoutWrappingEncoder<E> { this.pattern = pattern; } + public boolean isOutputPatternAsPresentationHeader() { + return outputPatternAsPresentationHeader; + } + + public void setOutputPatternAsPresentationHeader(boolean outputPatternAsPresentationHeader) { + this.outputPatternAsPresentationHeader = outputPatternAsPresentationHeader; + } + @Override public void setLayout(Layout<E> layout) { throw new UnsupportedOperationException("one cannot set the layout of " diff --git a/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java index 86130b2..c0caf51 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java @@ -108,6 +108,8 @@ public class OutputStreamAppenderTest { String result = baos.toString(); String expectedHeader = emtptyIfNull(fileHeader) + emtptyIfNull(presentationHeader); + + System.out.println(result); assertTrue(result, result.startsWith(expectedHeader)); String expectedFooter = emtptyIfNull(presentationFooter) + emtptyIfNull(fileFooter); diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayout.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayout.java index d33e8c0..ce730de 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayout.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayout.java @@ -29,6 +29,7 @@ public class SamplePatternLayout<E> extends PatternLayoutBase<E> { public SamplePatternLayout() { converterMap.put("OTT", Converter123.class.getName()); converterMap.put("hello", ConverterHello.class.getName()); + outputPatternAsPresentationHeader = false; } public Map<String, String> getDefaultConverterMap() { ----------------------------------------------------------------------- Summary of changes: .../classic/encoder/PatternLayoutEncoder.java | 1 + .../src/test/input/joran/rolling/basic.xml | 1 + .../src/test/input/joran/rolling/timeAndSize.xml | 1 + .../src/test/input/joran/smtp/customBufferSize.xml | 5 +++-- .../src/test/input/joran/smtp/customEvaluator.xml | 1 + .../classic/encoder/PatternLayoutEncoderTest.java | 1 + .../classic/net/SMTPAppender_GreenTest.java | 1 + .../logback/core/pattern/PatternLayoutBase.java | 20 +++++++++----------- .../core/pattern/PatternLayoutEncoderBase.java | 9 +++++++++ .../qos/logback/core/OutputStreamAppenderTest.java | 2 ++ .../core/pattern/parser/SamplePatternLayout.java | 1 + 11 files changed, 30 insertions(+), 13 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBSITE-46) wrong url for dcache
by Antje Petersen (JIRA) 08 Mar '12

08 Mar '12

wrong url for dcache -------------------- Key: LBSITE-46 URL: http://jira.qos.ch/browse/LBSITE-46 Project: logback-site Issue Type: Bug Reporter: Antje Petersen Assignee: Logback dev list On http://logback.qos.ch/ in Projects known to rely on logback the url for dcache is wrong. It should be http://www.dcache.org/downloads/1.9/release-notes-1.9.10-latest.html#logging Please correct. Thanks, antje -- 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_1.0.1-4-g38089b6
by git-noreply＠pixie.qos.ch 08 Mar '12

08 Mar '12

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 38089b6999db113907a8978b229f823bcf552211 (commit) from add5b0681c0b7fc757f5b852da0b89d00e1d2148 (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=38089b6999db113907a8978b… http://github.com/ceki/logback/commit/38089b6999db113907a8978b229f823bcf552… commit 38089b6999db113907a8978b229f823bcf552211 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Mar 8 15:02:47 2012 +0100 added new links diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 7ec14b0..d9a1b7c 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -69,14 +69,16 @@ <li><a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a></li> <li><a href="http://www.jfrog.org/products.php">Artifactory</a></li> <li><a href="http://cia.sourceforge.net/">Citizen Intelligence Agency</a></li> - <li><a href="http://www.dcache.org/downloads/1.9/release-notes-1.9.10-4.html#logging">dCache</a></li> + <li><a href="http://www.dcache.org/">dCache</a></li> <li><a href="http://www.geomajas.org/">Geomajas</a></li> <li><a href="http://www.gradle.org/">Gradle</a></li> - <li><a href="http://jmxmonitor.sourceforge.net/">JMX Monitor</a></li> + <li><a href="http://grinder.sourceforge.net/">Grinder</a></li> + <li><a href="http://wiki.yoshtec.com/jaob">JAOP</a></li> </ul> </td> <td valign="top"> <ul> + <li><a href="http://jmxmonitor.sourceforge.net/">JMX Monitor</a></li> <li><a href="http://jwebunit.sourceforge.net/quickstart.html">JWebUnit</a></li> <li><a href="http://liftweb.net/">Lift</a></li> <li><a href="http://www.opengda.org/">OpenGDA</a></li> @@ -90,6 +92,7 @@ <td valign="top"> <ul> + <li><a href="http://www.scalatra.org/2.0/book/">Scalatra</a></li> <li><a href="http://shibboleth.internet2.edu/">Shibboleth</a></li> <li><a href="http://sonar.codehaus.org/">Sonar</a></li> <li><a @@ -99,6 +102,7 @@ <li><a href="http://www.eclipse.org/virgo/">Virgo Web Server</a></li> <li><a href="http://xtrememp.sourceforge.net/">XtremeMP</a></li> <li><a href="http://www.xuggle.com/xuggler/">Xuggler</a></li> + <li><a href="http://www.xwiki.org/">Xwiki</a></li> </ul> </td> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-320) Allow logger pattern filter to collapse x levels of package name
by Antony Stubbs (JIRA) 08 Mar '12

08 Mar '12

Allow logger pattern filter to collapse x levels of package name ---------------------------------------------------------------- Key: LBCLASSIC-320 URL: http://jira.qos.ch/browse/LBCLASSIC-320 Project: logback-classic Issue Type: Improvement Components: layout Affects Versions: 1.0.0 Reporter: Antony Stubbs Assignee: Logback dev list It would be great, instead of only working on a character level, to be able to work at a package level. I.e. logger{p3} would convert org.apache.solr.handlers.dataimporthandler to o.a.s.handlers.dataimporthandler -- 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 1

[JIRA] Created: (LBCLASSIC-312) SiftingAppender does not substitute variable value inside sift
by Dmitrius Listo (JIRA) 08 Mar '12

08 Mar '12

SiftingAppender does not substitute variable value inside sift -------------------------------------------------------------- Key: LBCLASSIC-312 URL: http://jira.qos.ch/browse/LBCLASSIC-312 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 1.0.0 Environment: Ubuntu 11.04, Eclipse 3.7 Reporter: Dmitrius Listo Assignee: Logback dev list Faced a probable bug (at least, did not find any mention about such issue at manual/google/other bugs in category). Brief logging configuration description: I have a property defined in my logback configuration. There is a property with log file location defined: <property name="LOG_HOME" value="/tmp/aicore" /> Also, I have ConsoleAppender and two RollingFileAppender appenders, attached to root logger. RollingFileAppender configuration contains LOG_HOME variable in path and substitution is done without any issues, log file is created and updated. But when I add SiftingAppender (log files are created on per-threadId basis), that contains FileAppender in it's sift section, variable value is not substituted. Here is the logback log fragment, generated using OnConsoleStatusListener: 22:11:27,396 |-INFO in ch.qos.logback.core.joran.action.AppenderAction - About to instantiate appender of type [ch.qos.logback.core.FileAppender] 22:11:27,396 |-INFO in ch.qos.logback.core.joran.action.AppenderAction - Naming appender as [FILE-server] 22:11:27,398 |-INFO in ch.qos.logback.core.joran.action.NestedComplexPropertyIA - Assuming default type [ch.qos.logback.classic.encoder.PatternLayoutEncoder] for [encoder] property 22:11:27,400 |-INFO in ch.qos.logback.core.FileAppender[FILE-server] - File property is set to [LOG_HOME_IS_UNDEFINED/thread-server.log] Note the "LOG_HOME_IS_UNDEFINED/thread-server.log" value. As a result, no any sift log file is created in expected location. When I substitute ${LOG_HOME} value manually, everything works well. Below is my SiftingAppender config: <appender name="SIFT" class="ch.qos.logback.classic.sift.SiftingAppender"> <discriminator class="ch.qos.logback.classic.sift.MDCBasedDiscriminator"> <key>threadId</key> <defaultValue>unclassified</defaultValue> </discriminator> <sift> <appender name="FILE-${threadId}" class="ch.qos.logback.core.FileAppender"> <file>${LOG_HOME}/thread-${threadId}.log</file> <append>false</append> <encoder> <pattern>%d [%thread] %level %mdc %logger{35} - %msg%n</pattern> </encoder> </appender> </sift> </appender> Sorry if bug report is not formed perfectly, I have not much expertise yet :) -- 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

[JIRA] Created: (LBCORE-249) Support loading configuration via classpath
by Alex Glass (JIRA) 08 Mar '12

08 Mar '12

Support loading configuration via classpath ------------------------------------------- Key: LBCORE-249 URL: http://jira.qos.ch/browse/LBCORE-249 Project: logback-core Issue Type: Improvement Components: Joran Affects Versions: unspecified Reporter: Alex Glass Assignee: Logback dev list Priority: Minor A lot of boilerplate is needed to load a configuration file with Joran. I suggest improving doConfigure to support scanning inputs on the classpath. Sample code of 7 lines could be condensed to two. LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(context); context.reset(); InputStream inputStream = SmtpTest.class.getClassLoader().getResourceAsStream(INPUT_FILE); if(inputStream == null) throw new IllegalStateException("File not found: " + INPUT_FILE); configurator.doConfigure(inputStream); VS JoranConfigurator configurator = new JoranConfigurator(); configurator.doConfigure(INPUT_FILE); -- 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_1.0.1-3-gadd5b06
by git-noreply＠pixie.qos.ch 07 Mar '12

07 Mar '12

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 add5b0681c0b7fc757f5b852da0b89d00e1d2148 (commit) from 4bd6f468342d5d4eff28f3d56accf577066d1b60 (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=add5b0681c0b7fc757f5b852… http://github.com/ceki/logback/commit/add5b0681c0b7fc757f5b852da0b89d00e1d2… commit add5b0681c0b7fc757f5b852da0b89d00e1d2148 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 7 18:19:30 2012 +0100 ongoing work on LBCORE-234 diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java index 07d8400..6ce3241 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java @@ -32,8 +32,13 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { String pattern; protected PostCompileProcessor<E> postCompileProcessor; + Map<String, String> instanceConverterMap = new HashMap<String, String>(); + + + boolean forceEmptyPresentationHeader = false; + /** * Concrete implementations of this class are responsible for elaborating the * mapping between pattern words and converters. @@ -142,8 +147,19 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { return CoreConstants.EMPTY_STRING; } + public boolean isForceEmptyPresentationHeader() { + return forceEmptyPresentationHeader; + } + + public void setForceEmptyPresentationHeader(boolean forceEmptyPresentationHeader) { + this.forceEmptyPresentationHeader = forceEmptyPresentationHeader; + } + @Override public String getPresentationHeader() { - return getPresentationHeaderPrefix()+pattern; + if(forceEmptyPresentationHeader) + return null; + else + return getPresentationHeaderPrefix()+pattern; } } ----------------------------------------------------------------------- Summary of changes: .../logback/core/pattern/PatternLayoutBase.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-2-g4bd6f46
by git-noreply＠pixie.qos.ch 07 Mar '12

07 Mar '12

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 4bd6f468342d5d4eff28f3d56accf577066d1b60 (commit) from 25758b57b37fe6c80f1b9c9217a60d3d1b98b2c2 (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=4bd6f468342d5d4eff28f3d5… http://github.com/ceki/logback/commit/4bd6f468342d5d4eff28f3d56accf577066d1… commit 4bd6f468342d5d4eff28f3d56accf577066d1b60 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 7 18:13:42 2012 +0100 started work on LBCORE-234 diff --git a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java index a895d18..279140a 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java +++ b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java @@ -63,6 +63,7 @@ import ch.qos.logback.core.pattern.parser.Parser; public class PatternLayout extends PatternLayoutBase<IAccessEvent> { public static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); + public static final String HEADER_PREFIX = "#logback.access pattern: "; public static String CLF_PATTERN = "%h %l %u %t \"%r\" %s %b"; public static String CLF_PATTERN_NAME = "common"; @@ -184,4 +185,10 @@ public class PatternLayout extends PatternLayoutBase<IAccessEvent> { } super.start(); } + + + @Override + protected String getPresentationHeaderPrefix() { + return HEADER_PREFIX; + } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java index ef32df3..83d8e8b 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java @@ -58,7 +58,8 @@ import ch.qos.logback.core.pattern.parser.Parser; public class PatternLayout extends PatternLayoutBase<ILoggingEvent> { public static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); - + public static final String HEADER_PREFIX = "#logback.classic pattern: "; + static { defaultConverterMap.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP); @@ -145,4 +146,9 @@ public class PatternLayout extends PatternLayoutBase<ILoggingEvent> { } return writeLoopOnConverters(event); } + + @Override + protected String getPresentationHeaderPrefix() { + return HEADER_PREFIX; + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java index cc1475b..07d8400 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java @@ -136,4 +136,14 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> { public Map<String, String> getInstanceConverterMap() { return instanceConverterMap; } + + + protected String getPresentationHeaderPrefix() { + return CoreConstants.EMPTY_STRING; + } + + @Override + public String getPresentationHeader() { + return getPresentationHeaderPrefix()+pattern; + } } ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/access/PatternLayout.java | 7 +++++++ .../java/ch/qos/logback/classic/PatternLayout.java | 8 +++++++- .../logback/core/pattern/PatternLayoutBase.java | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-1-g25758b5
by git-noreply＠pixie.qos.ch 07 Mar '12

07 Mar '12

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 25758b57b37fe6c80f1b9c9217a60d3d1b98b2c2 (commit) from c7b030cd07df26f42df90ff90cbefe86d444e751 (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=25758b57b37fe6c80f1b9c92… http://github.com/ceki/logback/commit/25758b57b37fe6c80f1b9c9217a60d3d1b98b… commit 25758b57b37fe6c80f1b9c9217a60d3d1b98b2c2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 7 08:19:24 2012 +0100 start work on release 1.0.2 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 15b617f..18c768c 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index d604d5f..68f2b9a 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index dae0770..c7f01a7 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 2bb81dd..f33b201 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 4a99a89..e8d86e9 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index c91a88e..eed4f4a 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0