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 f1db4042a372249765b52d6b430b7f33dcbf410b (commit) from 2d5659a6ad57e8daf536f6263a274d1e0bc430ff (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=f1db4042a372249765b52d6b4... http://github.com/ceki/logback/commit/f1db4042a372249765b52d6b430b7f33dcbf41... commit f1db4042a372249765b52d6b430b7f33dcbf410b Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Dec 21 20:12:54 2010 +0100 add missing file diff --git a/logback-classic/src/test/input/joran/pattern/replace0.xml b/logback-classic/src/test/input/joran/pattern/replace0.xml new file mode 100644 index 0000000..dbdfd4a --- /dev/null +++ b/logback-classic/src/test/input/joran/pattern/replace0.xml @@ -0,0 +1,15 @@ +<configuration> + + <conversionRule conversionWord="sample" + converterClass="ch.qos.logback.classic.testUtil.SampleConverter" /> + + <appender name="LIST" class="ch.qos.logback.core.testUtil.StringListAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%replace(%msg){'\d{14,16}', 'XXXX'}</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="LIST" /> + </root> +</configuration> \ No newline at end of file diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java index 55ef3ff..6542a44 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java @@ -44,7 +44,6 @@ public class ReplacingCompositeConverter<E> extends CompositeConverter<E> { //.matcher(this).replaceAll(replacement); replacement = optionList.get(1); - System.out.println("regex="+regex); super.start(); } diff --git a/logback-site/src/site/pages/recipes/emailPerTransaction.html b/logback-site/src/site/pages/recipes/emailPerTransaction.html index 68d9837..a13a167 100644 --- a/logback-site/src/site/pages/recipes/emailPerTransaction.html +++ b/logback-site/src/site/pages/recipes/emailPerTransaction.html @@ -136,6 +136,7 @@ public class PrimeAction extends Action { <SMTPHost>NAME_OF_SMTP_HOST</SMTPHost> <to>...</to> <from>...</from> + <subject>Prime - %mdc{number}</subject> <layout class="ch.qos.logback.classic.html.HTMLLayout"> <pattern>%date%level%logger{24}%msg</pattern> </layout> @@ -159,7 +160,11 @@ public class PrimeAction extends Action { <p>While the previous configuration file will trigger an outgoing email message whenenver an event is marked with "SMTP_TRIGGER", the - contents of the message will lump together messag + contents of the message will contain events generated by different + transactions. With a little effort, we can actually seperate events + belonging to different transactions so that the outgoing email + triggeed at the end of the transaction contains logs from that + transaction and only that one. </p> @@ -171,6 +176,7 @@ public class PrimeAction extends Action { <smtpHost>NAME_OF_SMTP_HOST</smtpHost> <to>name@some.smtp.host</to> <from>testing@...</from> + <subject>Prime - %mdc{number}</subject> <layout class="ch.qos.logback.classic.html.HTMLLayout"> <pattern>%date%level%logger{24}%msg</pattern> </layout> @@ -202,8 +208,10 @@ public class PrimeAction extends Action { <appender name="SMTP" class="ch.qos.logback.classic.net.SMTPAppender"> <SMTPHost>NAME_OF_SMTP_HOST</SMTPHost> - <To>com</To> - <From></From> + <to>com</to> + <from></from> + <subject>Prime - %mdc{number}</subject> + <layout class="ch.qos.logback.classic.html.HTMLLayout"> <pattern>%date%level%logger{24}%msg</pattern> </layout> ----------------------------------------------------------------------- Summary of changes: .../patternLayout0.xml => pattern/replace0.xml} | 2 +- .../core/pattern/ReplacingCompositeConverter.java | 1 - .../site/pages/recipes/emailPerTransaction.html | 14 +++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) copy logback-classic/src/test/input/joran/{conversionRule/patternLayout0.xml => pattern/replace0.xml} (82%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.