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

[JIRA] Created: (LBCLASSIC-316) SiftingAppender and the lifecycle of created appenders
by Guus Bloemsma (JIRA) 06 Mar '12

06 Mar '12

SiftingAppender and the lifecycle of created appenders ------------------------------------------------------ Key: LBCLASSIC-316 URL: http://jira.qos.ch/browse/LBCLASSIC-316 Project: logback-classic Issue Type: Improvement Components: appender Affects Versions: 1.0.0 Environment: servlet container Reporter: Guus Bloemsma Assignee: Logback dev list I'm using SiftingAppender to create logfiles per servlet request. I wrote a servlet filter to add session and request id's into MDC. A custom appender (nested into SiftingAppender) buffers all logging events. Only when a WARN or ERROR occurred it writes all of them at the end of the servlet request to yet another nested appender. Logback made this surprisingly easy! This all works fine except for one little problem. The SiftingAppender creates a new custom appender for each request. It uses a AppenderTrackerImpl to keep track of them. That AppenderTrackerImpl holds on to those appenders for half an hour even though it is guaranteed that they won't be needed after the request. That is a lot of unused appenders! Being able to configure that timeout per SiftingAppender would be one solution. Another way would be to make the method ch.qos.logback.core.sift.AppenderTrackerImpl.isEntryStale(Entry, long) check whether the appender in the entry is stopped. In that case it should be treated as stale as well. My custom appender would simply stop itself once it is no longer used. BTW, I understand that I'm kind of abusing SiftingAppender. Maybe I should just make my own... -- 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 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-72-g1169a18
by git-noreply＠pixie.qos.ch 06 Mar '12

06 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 1169a18f6aac21cbbc1f2e60dfb7b75b2a2399a0 (commit) from 26a0a37ccb1107094b079154e1a2d0f8c41eb9b6 (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=1169a18f6aac21cbbc1f2e60… http://github.com/ceki/logback/commit/1169a18f6aac21cbbc1f2e60dfb7b75b2a239… commit 1169a18f6aac21cbbc1f2e60dfb7b75b2a2399a0 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 6 22:17:13 2012 +0100 Fix LBCLASSIC-316 diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java index fe57c1b..d9318d9 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java @@ -328,17 +328,20 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { sbuf.append(footer); } + String subjectStr = "Undefined subject"; if (subjectLayout != null) { - mimeMsg.setSubject(subjectLayout.doLayout(lastEventObject), - charsetEncoding); + subjectStr = subjectLayout.doLayout(lastEventObject); } + mimeMsg.setSubject(subjectStr, charsetEncoding); List<InternetAddress> destinationAddresses = parseAddress(lastEventObject); if (destinationAddresses.isEmpty()) { addInfo("Empty destination address. Aborting email transmission"); return; } - mimeMsg.setRecipients(Message.RecipientType.TO, destinationAddresses.toArray(EMPTY_IA_ARRAY)); + + InternetAddress[] toAddressArray = destinationAddresses.toArray(EMPTY_IA_ARRAY); + mimeMsg.setRecipients(Message.RecipientType.TO, toAddressArray); String contentType = layout.getContentType(); @@ -355,6 +358,7 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { mimeMsg.setSentDate(new Date()); Transport.send(mimeMsg); + addInfo("Sent out SMTP message \""+subjectStr+"\" to "+Arrays.toString(toAddressArray)); } catch (Exception e) { addError("Error occurred while sending e-mail notification.", e); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderTrackerImpl.java b/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderTrackerImpl.java index 59d1033..c5a361a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderTrackerImpl.java +++ b/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderTrackerImpl.java @@ -108,6 +108,12 @@ public class AppenderTrackerImpl<E> implements AppenderTracker<E> { private boolean isEntryStale(Entry entry, long now) { + // stopped or improperly started appenders are considered stale + // see also http://jira.qos.ch/browse/LBCLASSIC-316 + if(!entry.value.isStarted()) + return true; + + // unused appenders are also considered stale return ((entry.timestamp + THRESHOLD) < now); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java b/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java index 745b865..b9168cb 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java +++ b/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java @@ -116,6 +116,7 @@ public class Simulator { Appender<Object> appender = appenderTracker.get(key, timestamp); if (appender == null) { appender = new NOPAppender<Object>(); + appender.start(); appenderTracker.put(key, appender, timestamp); } appenderTracker.stopStaleAppenders(timestamp); diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html index 18c46b2..56cf6f9 100644 --- a/logback-site/src/site/pages/manual/appenders.html +++ b/logback-site/src/site/pages/manual/appenders.html @@ -2462,7 +2462,7 @@ logger.error(notifyAdmin, host, greatly facilitating problem diagnosis. - <h4><a name= "bufferManagement" href="#bufferManagement">On buffer + <h4><a name= "bufferManagement" href="#bufferManagement">Buffer management in very busy systems</a></h4> Internally, each distinct value returned by the discriminator diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 0a6ba3f..1dadd0d 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -60,6 +60,12 @@ as reported by Chris Cheshire. + SiftingAppender will consider stale and consequently remove + nested appenders which are closed or improperly started. This + caters for the use case described in <a + href="http://jira.qos.ch/browse/LBCLASSIC-316">LBCLASSIC-316</a> + by Guus Bloemsma. + <code>RequestLogImpl</code> can now lookup for the logback-access configuration file as a class path resource. This feature was requested in <a ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/net/SMTPAppenderBase.java | 10 +++++++--- .../qos/logback/core/sift/AppenderTrackerImpl.java | 6 ++++++ .../java/ch/qos/logback/core/sift/Simulator.java | 1 + logback-site/src/site/pages/manual/appenders.html | 2 +- logback-site/src/site/pages/news.html | 6 ++++++ 5 files changed, 21 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-213) Do not restrict SMTPAppender <to> to only 1 email address
by Alexandre Garnier (JIRA) 06 Mar '12

06 Mar '12

Do not restrict SMTPAppender <to> to only 1 email address --------------------------------------------------------- Key: LBCORE-213 URL: http://jira.qos.ch/browse/LBCORE-213 Project: logback-core Issue Type: Bug Reporter: Alexandre Garnier Assignee: Logback dev list It's not possible to have multiple email address in <to> element of SMTPAppender because only the first one is used (https://github.com/ceki/logback/blob/master/logback-core/src/main/java/ch/q…) When using a property, multiple <to> element is not really easy (if even possible)... Example: <appender name="email" class="ch.qos.logback.classic.net.SMTPAppender"> ... <to>${mail.log.to}</to> ... </appender> With properties : mail.log.to = admin@domain.com,dev@domain.com,op@domain.com => Only admin(a)domain.com get the email ! -- 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: (LBCLASSIC-221) SMTPAppender includes irrelevant logging events
by Chris Cheshire (JIRA) 06 Mar '12

06 Mar '12

SMTPAppender includes irrelevant logging events ----------------------------------------------- Key: LBCLASSIC-221 URL: http://jira.qos.ch/browse/LBCLASSIC-221 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.24 Environment: Java6, Tomcat6 Reporter: Chris Cheshire Assignee: Logback dev list The BufferSize parameter to SMTPAppender has been removed with no replacement. When the SMTPAppender is triggered by an error event it also includes the previous 255 logging events, whether they were errors or not (now that the buffer size is fixed). By using BufferSize = 1, I was able to send a single error email every time an error occurred with just that error. Now I get completely irrelevant logging events, potentially days old with nothing to do with the error being logged and no simple way to change this. I'm not sure what version this was introduced - I just upgraded from 0.9.17 to 0.9.24. -- 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

5 5

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-71-g26a0a37
by git-noreply＠pixie.qos.ch 06 Mar '12

06 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 26a0a37ccb1107094b079154e1a2d0f8c41eb9b6 (commit) from bfe8b7f3b44493325020de0d6b852a38be9b4053 (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=26a0a37ccb1107094b079154… http://github.com/ceki/logback/commit/26a0a37ccb1107094b079154e1a2d0f8c41eb… commit 26a0a37ccb1107094b079154e1a2d0f8c41eb9b6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 6 17:59:32 2012 +0100 Fix LBCLASSIC-221 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 cc20e17..fe0a6ba 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 @@ -272,13 +272,13 @@ public class SMTPAppender_GreenTest { smtpAppender.setLayout(buildPatternLayout(lc)); smtpAppender.start(); logger.addAppender(smtpAppender); - String h1 = "hello one"; - logger.debug(h1); - logger.error("error one"); + String msg0 = "hello zero"; + logger.debug(msg0); + logger.error("error zero"); - String h2 = "hello two"; - logger.debug(h2); - logger.error("error two"); + String msg1 = "hello one"; + logger.debug(msg1); + logger.error("error one"); waitUntilEmailIsSent(); @@ -290,12 +290,14 @@ public class SMTPAppender_GreenTest { MimeMultipart content0 = (MimeMultipart) mm0.getContent(); String body0 = GreenMailUtil.getBody(content0.getBodyPart(0)); System.out.println(body0); + System.out.println("--------------"); MimeMessage mm1 = mma[1]; MimeMultipart content1 = (MimeMultipart) mm1.getContent(); String body1 = GreenMailUtil.getBody(content1.getBodyPart(0)); - assertFalse(body1.contains(h1)); System.out.println(body1); + // second body should not contain content from first message + assertFalse(body1.contains(msg0)); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java index 494afdb..fe57c1b 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java @@ -184,8 +184,13 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { try { if (eventEvaluator.evaluate(eventObject)) { + // clone the CyclicBuffer before sending out asynchronously + CyclicBuffer<E> cbClone = new CyclicBuffer<E>(cb); + // see http://jira.qos.ch/browse/LBCLASSIC-221 + cb.clear(); + // perform actual sending asynchronously - SenderRunnable senderRunnable = new SenderRunnable(new CyclicBuffer<E>(cb), eventObject); + SenderRunnable senderRunnable = new SenderRunnable(cbClone, eventObject); context.getExecutorService().execute(senderRunnable); } } catch (EvaluationException ex) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/helpers/CyclicBufferTest.java b/logback-core/src/test/java/ch/qos/logback/core/helpers/CyclicBufferTest.java new file mode 100644 index 0000000..e4fd7f4 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/helpers/CyclicBufferTest.java @@ -0,0 +1,48 @@ +package ch.qos.logback.core.helpers; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class CyclicBufferTest { + + + void assertSize(CyclicBuffer<String> cb, int size) { + assertEquals(size, cb.length()); + } + @Test + public void smoke() { + CyclicBuffer<String> cb = new CyclicBuffer<String>(2); + assertSize(cb, 0); + cb.add("zero"); + assertSize(cb, 1); + cb.add("one"); + assertSize(cb, 2); + cb.add("two"); + assertSize(cb, 2); + assertEquals("one", cb.get()); + assertSize(cb, 1); + assertEquals("two",cb.get()); + assertSize(cb, 0); + } + + + @Test + public void cloning() { + CyclicBuffer<String> cb = new CyclicBuffer<String>(2); + cb.add("zero"); + cb.add("one"); + + CyclicBuffer<String> clone = new CyclicBuffer<String>(cb); + assertSize(clone, 2); + cb.clear(); + assertSize(cb, 0); + + List<String> witness = Arrays.asList("zero", "one"); + assertEquals(witness, clone.asList()); + + } +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java index ab2e639..053db92 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java @@ -19,7 +19,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({ThrowableToStringArrayTest.class, FileUtilTest.class}) +(a)SuiteClasses({ThrowableToStringArrayTest.class, FileUtilTest.class, CyclicBufferTest.class}) public class PackageTest { } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5e654c8..0a6ba3f 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -54,6 +54,12 @@ href="http://jira.qos.ch/browse/LBCLASSIC-276">LBCLASSIC-276</a>. + <code>SMTPAppender</code> clears the relevant cyclic buffer + before asynchronous transmission. This corrects <a + href="http://jira.qos.ch/browse/LBCLASSIC-221">LBCLASSIC-221</a> + as reported by Chris Cheshire. + + <code>RequestLogImpl</code> can now lookup for the logback-access configuration file as a class path resource. This feature was requested in <a ----------------------------------------------------------------------- Summary of changes: .../classic/net/SMTPAppender_GreenTest.java | 16 ++++--- .../ch/qos/logback/core/net/SMTPAppenderBase.java | 7 +++- .../qos/logback/core/helpers/CyclicBufferTest.java | 48 ++++++++++++++++++++ .../ch/qos/logback/core/helpers/PackageTest.java | 2 +- logback-site/src/site/pages/news.html | 6 +++ 5 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/helpers/CyclicBufferTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

LBCORE-179: Fix regarding incorrect stack trace depth when specifying %throwable with argument
by Jonathan Ruckwood 06 Mar '12

06 Mar '12

Hi, I pushed a code fix for LBCORE-179**, some time ago and I was wondering there is more I need to do in order to get my changes merged? I must apologise in advance if I've missed some obligation on my part - I'm fairly new to Git and social coding. Regards, Jonathan ** https://github.com/ceki/**logback/pull/25<https://github.com/ceki/logback/pull/25>

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-70-gbfe8b7f
by git-noreply＠pixie.qos.ch 05 Mar '12

05 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 bfe8b7f3b44493325020de0d6b852a38be9b4053 (commit) via 45879248ca1dad7b0d5894339c86dc7f530b722e (commit) from d9c06c3183b09d38394fd0dc3faef226da6b29fe (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=bfe8b7f3b44493325020de0d… http://github.com/ceki/logback/commit/bfe8b7f3b44493325020de0d6b852a38be9b4… commit bfe8b7f3b44493325020de0d6b852a38be9b4053 Merge: 4587924 d9c06c3 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 5 18:04:13 2012 +0100 Merge branch 'master' of git.qos.ch:logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=45879248ca1dad7b0d589433… http://github.com/ceki/logback/commit/45879248ca1dad7b0d5894339c86dc7f530b7… commit 45879248ca1dad7b0d5894339c86dc7f530b722e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 5 18:02:47 2012 +0100 auxiliary %d tokens are marked as such with 'aux' 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 index 7d574a4..500a0ae 100644 --- 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 @@ -49,11 +49,14 @@ public class TimeBasedFileNamingAndTriggeringPolicyBaseTest { assertEquals("foo-2011-12T59.log", elapsedPeriodsFileName); } -@Test + // see "log rollover should be configurable using %d multiple times in file name pattern" + // http://jira.qos.ch/browse/LBCORE-242 + + @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.setFileNamePattern("foo-%d{yyyy-MM, AUX}/%d{mm}.log"); tbrp.start(); timeBasedFNATP.setCurrentTime(startTime); diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index 34e9b6b..823795e 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -587,15 +587,14 @@ WARN [main]: Message 2 city. - Given that the comma ',' character is the option - separator, the pattern string [HH:mm:ss,SSS] will print the - time in the [SSS] time zone which does not exist. Thus, the - time will be printed in the default GMT timezone. If you - wish to include a comma in your date pattern, then simply - enclose the pattern between quotes. For example, - %date{"HH:mm:ss,SSS"}. + Given that the comma ',' character is interpreted as the + option separator, the pattern string [HH:mm:ss,SSS] will + print the time in the [SSS] time zone which does not + exist. Thus, the time will be printed in the default GMT + timezone. If you wish to include a comma in your date + pattern, then simply enclose the pattern between quotes. For + example, %date{"HH:mm:ss,SSS"}. - </td> </tr> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5a399c7..5e654c8 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -41,10 +41,13 @@ reported by Bruce E. Irving. - It is now possible to specify multiple %d token in the file - name pattern of TimeBasedRollingPolicy. This feature was requested - in <a href="http://jira.qos.ch/browse/LBCORE-242">/LBCORE-242</a> - by Thomas Corte. + It is now possible to specify multiple %d tokens in the file + name pattern of <a + href="manual/appenders.html#TimeBasedRollingPolicy">TimeBasedRollingPolicy</a>. Auxiliary + %d tokens must be marked as such by passing the AUX + paramater. This feature was requested in <a + href="http://jira.qos.ch/browse/LBCORE-242">LBCORE-242</a> by + Thomas Corte. Logback now supports suppressed exceptions introduced in Java 7. This fixes <a ----------------------------------------------------------------------- Summary of changes: ...BasedFileNamingAndTriggeringPolicyBaseTest.java | 7 +++++-- logback-site/src/site/pages/manual/layouts.html | 15 +++++++-------- logback-site/src/site/pages/news.html | 11 +++++++---- 3 files changed, 19 insertions(+), 14 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.0-68-gd9c06c3
by git-noreply＠pixie.qos.ch 01 Mar '12

01 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 d9c06c3183b09d38394fd0dc3faef226da6b29fe (commit) from 65b370c9dc28c31d23b9bf4a2269de08685e7327 (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=d9c06c3183b09d38394fd0dc… http://github.com/ceki/logback/commit/d9c06c3183b09d38394fd0dc3faef226da6b2… commit d9c06c3183b09d38394fd0dc3faef226da6b29fe Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Mar 1 20:25:39 2012 +0100 ongoing work 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 0fdf203..cc20e17 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 @@ -13,10 +13,6 @@ */ package ch.qos.logback.classic.net; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.concurrent.TimeUnit; @@ -48,6 +44,8 @@ import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.GreenMailUtil; import com.icegreen.greenmail.util.ServerSetup; +import static org.junit.Assert.*; + public class SMTPAppender_GreenTest { int port = RandomUtil.getRandomServerPort(); @@ -64,7 +62,7 @@ public class SMTPAppender_GreenTest { public void setUp() throws Exception { MDC.clear(); ServerSetup serverSetup = new ServerSetup(port, "localhost", - ServerSetup.PROTOCOL_SMTP); + ServerSetup.PROTOCOL_SMTP); greenMail = new GreenMail(serverSetup); greenMail.start(); // let the grean mail server get a head start @@ -109,7 +107,7 @@ public class SMTPAppender_GreenTest { } private MimeMultipart verify(String subject) throws MessagingException, - IOException { + IOException { MimeMessage[] mma = greenMail.getReceivedMessages(); assertNotNull(mma); assertEquals(1, mma.length); @@ -123,6 +121,7 @@ public class SMTPAppender_GreenTest { lc.getExecutorService().shutdown(); lc.getExecutorService().awaitTermination(1000, TimeUnit.MILLISECONDS); } + @Test public void smoke() throws Exception { buildSMTPAppender(); @@ -132,7 +131,7 @@ public class SMTPAppender_GreenTest { logger.debug("hello"); logger.error("en error", new Exception("an exception")); - waitUntilEmailIsSent(); + waitUntilEmailIsSent(); // synchronized (smtpAppender) { // smtpAppender.wait(); // } @@ -187,7 +186,7 @@ public class SMTPAppender_GreenTest { /** * Checks that even when many events are processed, the output is still * conforms to xhtml-strict.dtd. - * + * * Note that SMTPAppender only keeps only 500 or so (=buffer size) events. So * the generated output will be rather short. */ @@ -201,7 +200,7 @@ public class SMTPAppender_GreenTest { } logger.error("en error", new Exception("an exception")); - waitUntilEmailIsSent(); + waitUntilEmailIsSent(); MimeMultipart mp = verify(TEST_SUBJECT); // verify strict adherence to xhtml1-strict.dtd @@ -222,7 +221,7 @@ public class SMTPAppender_GreenTest { @Test public void testCustomEvaluator() throws Exception { configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "smtp/customEvaluator.xml"); + + "smtp/customEvaluator.xml"); logger.debug("hello"); String msg2 = "world"; @@ -237,7 +236,7 @@ public class SMTPAppender_GreenTest { @Test public void testCustomBufferSize() throws Exception { configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "smtp/customBufferSize.xml"); + + "smtp/customBufferSize.xml"); logger.debug("invisible1"); logger.debug("invisible2"); @@ -264,4 +263,40 @@ public class SMTPAppender_GreenTest { assertNotNull(mma); assertEquals(3, mma.length); } + + + // http://jira.qos.ch/browse/LBCLASSIC-221 + @Test + public void bufferShouldBeResetBetweenMessages() throws Exception { + buildSMTPAppender(); + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + logger.addAppender(smtpAppender); + String h1 = "hello one"; + logger.debug(h1); + logger.error("error one"); + + String h2 = "hello two"; + logger.debug(h2); + logger.error("error two"); + + waitUntilEmailIsSent(); + + MimeMessage[] mma = greenMail.getReceivedMessages(); + assertNotNull(mma); + assertEquals(2, mma.length); + + MimeMessage mm0 = mma[0]; + MimeMultipart content0 = (MimeMultipart) mm0.getContent(); + String body0 = GreenMailUtil.getBody(content0.getBodyPart(0)); + System.out.println(body0); + + MimeMessage mm1 = mma[1]; + MimeMultipart content1 = (MimeMultipart) mm1.getContent(); + String body1 = GreenMailUtil.getBody(content1.getBodyPart(0)); + assertFalse(body1.contains(h1)); + System.out.println(body1); + + + } } ----------------------------------------------------------------------- Summary of changes: .../classic/net/SMTPAppender_GreenTest.java | 57 ++++++++++++++++---- 1 files changed, 46 insertions(+), 11 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.0-67-g65b370c
by git-noreply＠pixie.qos.ch 01 Mar '12

01 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 65b370c9dc28c31d23b9bf4a2269de08685e7327 (commit) from 0877b9c3e93e159adce108834e608b67929ec74d (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=65b370c9dc28c31d23b9bf4a… http://github.com/ceki/logback/commit/65b370c9dc28c31d23b9bf4a2269de08685e7… commit 65b370c9dc28c31d23b9bf4a2269de08685e7327 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Mar 1 19:55:14 2012 +0100 minor edits diff --git a/logback-site/src/site/pages/access.html b/logback-site/src/site/pages/access.html index 6e69f22..a3707ba 100644 --- a/logback-site/src/site/pages/access.html +++ b/logback-site/src/site/pages/access.html @@ -325,7 +325,7 @@ The configuration file below configures a daily rolling <code>RollingFileAppender</code>. Note that due to the .zip suffix included in the value for fileNamePattern option, the log file are not + class="option">fileNamePattern option, the log files are not only rolled daily, but they are also automatically compressed. diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html index edb0a13..18c46b2 100644 --- a/logback-site/src/site/pages/manual/appenders.html +++ b/logback-site/src/site/pages/manual/appenders.html @@ -2359,7 +2359,7 @@ logger.error(notifyAdmin, <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> <smtpHost>smtp.gmail.com</smtpHost> <smtpPort>465</smtpPort> - <ssl>true</ssl> + <SSL>true</SSL> <username>YOUR_USERNAME(a)gmail.com</username> <password>YOUR_GMAIL_PASSWORD</password> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index c14f95d..0812333 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1279,7 +1279,7 @@ public class MyApp3 { Unix shells. The string between an opening ${ and closing } is interpreted as a reference to the value of the property. For property aKey, the string "${aKey}" will - be replaced the value held by the aKey property. + be replaced with the value held by the aKey property. A property can be defined in local scope (the default), ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/access.html | 2 +- logback-site/src/site/pages/manual/appenders.html | 2 +- .../src/site/pages/manual/configuration.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0