- logback-dev - mailman3.qos.ch

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

22 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 77e396324ca4d7e8d8d46d3b819a71b4d6864106 (commit) from d0f927bea04ee1a3a22230a2899fdcd7b6d1f795 (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=77e396324ca4d7e8d8d46d3b… http://github.com/ceki/logback/commit/77e396324ca4d7e8d8d46d3b819a71b4d6864… commit 77e396324ca4d7e8d8d46d3b819a71b4d6864106 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Mar 22 19:31:58 2012 +0100 minor edits diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index 823795e..b1145d2 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -1575,7 +1575,7 @@ public class ExceptionEvaluatorExample { </evaluator> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder + <encoder> <pattern>%msg%n%ex{full, DISPLAY_EX_EVAL}</pattern> </encoder> </appender> @@ -1612,7 +1612,7 @@ java.lang.Exception: display href="#xThrowable">packaging information</a> discussed earlier. - Important: With the %ex conversion + Note With the %ex conversion specifier, the stack trace is displayed when the expression evaluates to false. ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/manual/layouts.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-157) Add option to include caller data in JMS Appender or to disable caller data in DB Appender
by Ging Ming Chan (JIRA) 22 Mar '12

22 Mar '12

Add option to include caller data in JMS Appender or to disable caller data in DB Appender ------------------------------------------------------------------------------------------ Key: LBCLASSIC-157 URL: http://jira.qos.ch/browse/LBCLASSIC-157 Project: logback-classic Issue Type: New Feature Components: appender Affects Versions: 0.917 Reporter: Ging Ming Chan Assignee: Logback dev list Priority: Minor We are using the JMSQueueAppender remotely with a centralised server that uses the DBAppender to log to the database. However, since the JMSQueueAppender does not send the caller data, and the DBAppender always expect it, the operation never succeeded. There are two options to fix this, either add the includeCallerData option in the JMS Appender or to exclude caller data in the DB Appender. -- 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

4 4

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

15 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 d0f927bea04ee1a3a22230a2899fdcd7b6d1f795 (commit) from 87fa86b3f11844a8c15ed83d4a57e87214b3682e (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=d0f927bea04ee1a3a22230a2… http://github.com/ceki/logback/commit/d0f927bea04ee1a3a22230a2899fdcd7b6d1f… commit d0f927bea04ee1a3a22230a2899fdcd7b6d1f795 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Mar 15 14:49:06 2012 +0100 all 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 d19d540..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,7 +24,7 @@ public class PatternLayoutEncoder extends PatternLayoutEncoderBase<ILoggingEvent PatternLayout patternLayout = new PatternLayout(); patternLayout.setContext(context); patternLayout.setPattern(getPattern()); - //patternLayout.setOutputPatternAsPresentationHeader(outputPatternAsPresentationHeader); + 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 0c6d660..eb97e61 100644 --- a/logback-classic/src/test/input/joran/rolling/basic.xml +++ b/logback-classic/src/test/input/joran/rolling/basic.xml @@ -10,10 +10,8 @@ </FileNamePattern> </rollingPolicy> <encoder> - <layout class="ch.qos.logback.classic.PatternLayout"> - <pattern>%msg%n</pattern> - <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> - </layout> + <pattern>%msg%n</pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> </encoder> </appender> 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 8df4d16..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,9 +19,7 @@ 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; + protected boolean outputPatternAsPresentationHeader = true; public String getPattern() { return pattern; @@ -31,7 +29,13 @@ 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) { ----------------------------------------------------------------------- Summary of changes: .../classic/encoder/PatternLayoutEncoder.java | 2 +- .../src/test/input/joran/rolling/basic.xml | 6 ++---- .../core/pattern/PatternLayoutEncoderBase.java | 10 +++++++--- 3 files changed, 10 insertions(+), 8 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-7-g87fa86b
by git-noreply＠pixie.qos.ch 14 Mar '12

14 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 87fa86b3f11844a8c15ed83d4a57e87214b3682e (commit) from 94454601b654d4de8f836c27d192fed7613e7cf3 (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=87fa86b3f11844a8c15ed83d… http://github.com/ceki/logback/commit/87fa86b3f11844a8c15ed83d4a57e87214b36… commit 87fa86b3f11844a8c15ed83d4a57e87214b3682e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 14 23:14:57 2012 +0100 ongoing work 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 5bf4705..d19d540 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,7 +24,7 @@ public class PatternLayoutEncoder extends PatternLayoutEncoderBase<ILoggingEvent PatternLayout patternLayout = new PatternLayout(); patternLayout.setContext(context); patternLayout.setPattern(getPattern()); - patternLayout.setOutputPatternAsPresentationHeader(outputPatternAsPresentationHeader); + //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 e756f08..0c6d660 100644 --- a/logback-classic/src/test/input/joran/rolling/basic.xml +++ b/logback-classic/src/test/input/joran/rolling/basic.xml @@ -10,8 +10,10 @@ </FileNamePattern> </rollingPolicy> <encoder> - <Pattern>%msg%n</Pattern> - <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n</pattern> + <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader> + </layout> </encoder> </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 89f9b7a..bab8c26 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 @@ -19,6 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.Charset; +import ch.qos.logback.classic.PatternLayout; import org.junit.Before; import org.junit.Test; @@ -39,7 +40,6 @@ public class PatternLayoutEncoderTest { @Before public void setUp() { ple.setPattern("%m"); - ple.setOutputPatternAsPresentationHeader(false); ple.setContext(context); } @@ -49,8 +49,7 @@ public class PatternLayoutEncoderTest { @Test public void smoke() throws IOException { - ple.start(); - ple.init(baos); + init(baos); String msg = "hello"; ILoggingEvent event = makeLoggingEvent(msg); ple.doEncode(event); @@ -58,11 +57,16 @@ public class PatternLayoutEncoderTest { assertEquals(msg, baos.toString()); } + void init(ByteArrayOutputStream baos) throws IOException { + ple.start(); + ((PatternLayout) ple.getLayout()).setOutputPatternAsPresentationHeader(false); + ple.init(baos); + } + @Test public void charset() throws IOException { ple.setCharset(utf8Charset); - ple.start(); - ple.init(baos); + init(baos); String msg = "\u03b1"; ILoggingEvent event = makeLoggingEvent(msg); ple.doEncode(event); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java index bb9bda4..949d255 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/TimeBasedRollingWithConfigFileTest.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertTrue; import java.util.Date; +import ch.qos.logback.core.util.StatusPrinter; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -69,6 +70,7 @@ public class TimeBasedRollingWithConfigFileTest extends loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "rolling/" + testId + ".xml"); StatusChecker sc = new StatusChecker(lc); + StatusPrinter.print(lc ); assertTrue(sc.isErrorFree(0)); Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); 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 b68b76d..8df4d16 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 @@ -20,8 +20,8 @@ public class PatternLayoutEncoderBase<E> extends LayoutWrappingEncoder<E> { String pattern; - for reasons of consistency following attribute should be removed - protected boolean outputPatternAsPresentationHeader = true; + //for reasons of consistency following attribute should be removed + //protected boolean outputPatternAsPresentationHeader = true; public String getPattern() { return pattern; @@ -31,13 +31,7 @@ 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) { ----------------------------------------------------------------------- Summary of changes: .../classic/encoder/PatternLayoutEncoder.java | 2 +- .../src/test/input/joran/rolling/basic.xml | 6 ++++-- .../classic/encoder/PatternLayoutEncoderTest.java | 14 +++++++++----- .../TimeBasedRollingWithConfigFileTest.java | 2 ++ .../core/pattern/PatternLayoutEncoderBase.java | 10 ++-------- 5 files changed, 18 insertions(+), 16 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Uploading HTML files
by ceki 12 Mar '12

12 Mar '12

Hi Les, Hi Tony, For uploading HTML and other web-site related files, just pick up a folder under your home on holon.qos.ch. Once you tell me the location of the folder, I'll push/synchronize it on to the 3 machines serving http://logback.qos.ch/ under the relevant sub-tree. -- Ceki http://twitter.com/#!/ceki

1 0

Re: [logback-dev] SSH account on holon.qos.ch
by ceki 12 Mar '12

12 Mar '12

> On Mon, Mar 12, 2012 at 4:54 PM, ceki <ceki(a)qos.ch> > wrote: > > You will be needing the account on holon.qos.ch > to upload HTML pages to be published under > http://logback.qos.ch/android/ assuming you want to publish > into that space. On 12.03.2012 22:01, Tony Trinh wrote: > Ah, I see. I assume you want us to follow the site's current look and > feel (which I'm ok with). However, is it ok to throw in a tiny bit of > jQuery so long as it doesn't change the look? It would be unfortunate if the space under http://logback.qos.ch/android/ had a *completely* different look and feel. Having said that, I would not mind reasonable customizations in the space under http://logback.qos.ch/android/, including "a tiny bit of jQuery". :-) > I recall you seeking web developers a few months ago to redesign the > logback site. Is there an active effort for this that we would need to > coordinate with? I would like to help with this design, but I'm > currently swamped with coursework (I'm finishing up my Master's) and a > regular full-time job. I'll be free this summer though. I made a few minor changes to the site but nothing major. Ideally, changes to the site should be incremental but I am open to suggestions. > -Tony -- Ceki http://twitter.com/#!/ceki

1 0

Logback source code organization and extensions
by Les Hazlewood 10 Mar '12

10 Mar '12

Hi Ceki (et. al), I'm trying to wrap my head around making it easy to add and support contributions/extensions to logback in a clean/modular way. For example, I'd like to see a JSON formatter and a Loggly appender added to Logback. However, these additions probably don't make sense to be added to logback core/classic as they would bloat the library for those not using these features. As such, it makes sense (to me at least) to have a more modular source code organization where different features/extensions are represented as a dedicated Maven module. This way, people can easily (and deterministically) use a respective dependency depending on the feature they wish to enable. Clean and easy. Now, with regards to a JSON formatter and a Loggly appender (which would likely use the JSON formatter), I'd envision something like this in the Logback source tree: logback/ logback-access/ logback-classic/ logback-core/ ... logback-extensions/ Where 'logback-extensions' is a new Maven module. It would just be a wrapper module containing children. Below it, you might see the following: logback-extensions/ json/ common/ groovy/ jackson/ loggly/ foo/ bar/ ... In the above example, the logback-json module: 1) provides a 'common' sub module where JSON-specific needs are defined, and 2) has other sub-modules depending on _how_ you want JSON to be formatted. You can depend on the logback-json-jackson dependency if you want to use Jackson, or you can depend on logback-json-groovy if you want to use the built-in JSON support in a Groovy 1.8+ environment. The 'loggly' extension could depend on logback-json-common. The idea is that you can depend on a dependency that is copacetic with your intended runtime environment. I think this makes a lot of sense - we use it in Apache Shiro (http://svn.apache.org/repos/asf/shiro/trunk/support/) and it works very well for us. Before I go off and create my own 'logback-extensions' project on GitHub, I'd rather contribute this back to Logback proper as a pull request if this is something you are willing to implement. Thoughts? Cheers, -- Les Hazlewood CTO, Katasoft | http://www.katasoft.com | 888.391.5282 PMC Chair, Apache Shiro | http://shiro.apache.org twitter: @lhazlewood | http://twitter.com/lhazlewood katasoft blog: http://www.katasoft.com/blogs/lhazlewood personal blog: http://leshazlewood.com

3 12

[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