- logback-dev - mailman3.qos.ch

[JIRA] Created: (LBCORE-181) Memory issue caused by InfoStatus kept in StatusManager
by hefeng cui (JIRA) 17 Nov '10

17 Nov '10

Memory issue caused by InfoStatus kept in StatusManager -------------------------------------------------------- Key: LBCORE-181 URL: http://jira.qos.ch/browse/LBCORE-181 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.24, 0.9.25, 0.9.26 Environment: Linux, Reporter: hefeng cui Assignee: Logback dev list In my project, the RollingFileAppender was used with compression mechanism. Our application will generate lots of logs and then file rolling and compression will be triggered. We see the clear but slow trend of JVM's heap size increasement. By using the profiler tools to analysis the jvm memory, we saw there are lots of InfoStatus objects which keep increase with the number of file rolling. By looking at the source code, I found that StatusManager will keep those status forever if no explicit clear action invoked by api. Meantime, Compressor class will addStatus for each compression action. Then there is no way to garbage collect those InfoStatus. Below is the places where InfoStatus was created and added into StatusManager. ch.qos.logback.core.rolling.helper.Compressor public void compress(String nameOfFile2Compress, String nameOfCompressedFile) { switch (compressionMode) { case GZ: addInfo("GZ compressing [" + nameOfFile2Compress + "]."); gzCompress(nameOfFile2Compress, nameOfCompressedFile); break; case ZIP: addInfo("ZIP compressing [" + nameOfFile2Compress + "]."); zipCompress(nameOfFile2Compress, nameOfCompressedFile); break; case NONE: throw new UnsupportedOperationException( "compress method called in NONE compression mode"); } } If above analysis is correct, then I believe this will be a memory issue and it is a critical one. -- 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 4

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.25-33-g67733e2
by git-noreply＠pixie.qos.ch 16 Nov '10

16 Nov '10

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 67733e2544ada1403ad3c7420e1f17606e0c1f3a (commit) from 8c9b86fb1553924df8ea682ca39ef336db2725ae (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=67733e2544ada1403ad3c742… http://github.com/ceki/logback/commit/67733e2544ada1403ad3c7420e1f17606e0c1… commit 67733e2544ada1403ad3c7420e1f17606e0c1f3a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 16 23:41:38 2010 +0100 - minor edits diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java index 0868045..f66ae9d 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java @@ -21,11 +21,11 @@ import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import ch.qos.logback.access.AccessConstants; - +import static ch.qos.logback.access.AccessConstants.LB_INPUT_BUFFER; +import static ch.qos.logback.access.AccessConstants.X_WWW_FORM_URLECODED; /** * As the "tee" program on Unix, duplicate the request's input stream. - * + * * @author Ceki Gülcü */ class TeeHttpServletRequest extends HttpServletRequestWrapper { @@ -36,13 +36,14 @@ class TeeHttpServletRequest extends HttpServletRequestWrapper { TeeHttpServletRequest(HttpServletRequest request) { super(request); + // we can't access the input stream and access the request parameters + // at the same time if (Util.isFormUrlEncoded(request)) { postedParametersMode = true; } else { inStream = new TeeServletInputStream(request); // add the contents of the input buffer as an attribute of the request - request - .setAttribute(AccessConstants.LB_INPUT_BUFFER, inStream.getInputBuffer()); + request.setAttribute(LB_INPUT_BUFFER, inStream.getInputBuffer()); reader = new BufferedReader(new InputStreamReader(inStream)); } diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java index c544118..6c4e168 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java @@ -1,6 +1,6 @@ /** * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * Copyright (C) 1999-2010, QOS.ch. All rights reserved. * * This program and the accompanying materials are dual-licensed under * either the terms of the Eclipse Public License v1.0 as published by @@ -25,55 +25,53 @@ import javax.servlet.http.HttpServletRequest; class TeeServletInputStream extends ServletInputStream { - InputStream in; - byte[] inputBuffer; + InputStream in; + byte[] inputBuffer; - TeeServletInputStream(HttpServletRequest request) { - duplicateInputStream(request); - } + TeeServletInputStream(HttpServletRequest request) { + duplicateInputStream(request); + } - @Override - public int read() throws IOException { - return in.read(); - } + @Override + public int read() throws IOException { + return in.read(); + } - private void duplicateInputStream(HttpServletRequest request) { - ServletInputStream originalSIS = null; - try { - originalSIS = request.getInputStream(); - System.out.println("****************************************************"); - System.out.println("**************SIS type="+originalSIS.getClass().getName()); - inputBuffer = consumeBufferAndReturnAsByteArray(originalSIS); - this.in = new ByteArrayInputStream(inputBuffer); - } catch (IOException e) { - e.printStackTrace(); - } finally { - closeStrean(originalSIS); - } + private void duplicateInputStream(HttpServletRequest request) { + ServletInputStream originalSIS = null; + try { + originalSIS = request.getInputStream(); + inputBuffer = consumeBufferAndReturnAsByteArray(originalSIS); + this.in = new ByteArrayInputStream(inputBuffer); + } catch (IOException e) { + e.printStackTrace(); + } finally { + closeStrean(originalSIS); } + } - byte[] consumeBufferAndReturnAsByteArray(InputStream is) throws IOException { - int len = 1024; - byte[] temp = new byte[len]; - int c = -1; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - while ((c = is.read(temp, 0, len)) != -1) { - baos.write(temp, 0, c); - } - return baos.toByteArray(); + byte[] consumeBufferAndReturnAsByteArray(InputStream is) throws IOException { + int len = 1024; + byte[] temp = new byte[len]; + int c = -1; + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + while ((c = is.read(temp, 0, len)) != -1) { + baos.write(temp, 0, c); } + return baos.toByteArray(); + } - void closeStrean(ServletInputStream is) { - if (is != null) { - try { - is.close(); - } catch (IOException e) { - } - } + void closeStrean(ServletInputStream is) { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + } } + } - byte[] getInputBuffer() { - return inputBuffer; - } + byte[] getInputBuffer() { + return inputBuffer; + } } diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java index bcdde15..cdd1f2d 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java @@ -21,7 +21,7 @@ import ch.qos.logback.access.AccessConstants; public class Util { public static boolean isFormUrlEncoded(HttpServletRequest request) { - if ("POST".equals(request.getMethod()) + if ("POST".equalsIgnoreCase(request.getMethod()) && AccessConstants.X_WWW_FORM_URLECODED.equals(request.getContentType())) { return true; } else { diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index ffce20e..eef4e2b 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -72,12 +72,13 @@ <li><a href="http://cia.sourceforge.net/">Citizen Intelligence Agency</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> </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://www.opengda.org/">OpenGDA</a></li> <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> <li><a href="http://liftweb.net/">Lift</a></li> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 86a5035..3197d5a 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -31,6 +31,12 @@ <h3>xxx, 2010 - Release of version 0.9.27</h3> + <p><code>TeeServletInputStream</code> no longer chokes on input + over 8K in size. This fixes <a + href="http://jira.qos.ch/browse/LBACCESS-10">LBACCESS-10</a> as + reported by Augusto Rodriguez. + </p> + <p>Fixed <a href="http://jira.qos.ch/browse/LBCLASSIC-231">LBCLASSIC-231</a> as reported by Jeff Skjonsby. When configuring ----------------------------------------------------------------------- Summary of changes: .../access/servlet/TeeHttpServletRequest.java | 11 ++- .../access/servlet/TeeServletInputStream.java | 82 ++++++++++---------- .../java/ch/qos/logback/access/servlet/Util.java | 2 +- logback-site/src/site/pages/index.html | 5 +- logback-site/src/site/pages/news.html | 6 ++ 5 files changed, 56 insertions(+), 50 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBACCESS-10) Servlet input stream gets corrupted
by Augusto (JIRA) 16 Nov '10

16 Nov '10

Servlet input stream gets corrupted ----------------------------------- Key: LBACCESS-10 URL: http://jira.qos.ch/browse/LBACCESS-10 Project: logback-access Issue Type: Bug Components: Other Affects Versions: 0.9.17 Environment: Windows 7 - java 1.6.0_16-b01 - Hightide 6.1H10 Windows 7 - java 1.6.0_16-b01 - Tomcat 6.0.16 Solaris 5.10 - java 1.6.0_16 - Hightide 6.1H10 Reporter: Augusto Assignee: Logback dev list The request.inputStream() is wrapped in a TeeServletInputStreamm but this class fails to pass all the data in the original input stream to the servlets. In my tests is passes properly between 4 and 8kb of data and later it just return zeros instead of the characters. I'm attaching a very simple webapp that writes the input stream of a POST request into a file to demonstrate the bug. -- 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 4

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.25-32-g8c9b86f
by git-noreply＠pixie.qos.ch 16 Nov '10

16 Nov '10

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 8c9b86fb1553924df8ea682ca39ef336db2725ae (commit) from 268c89d8fe841c96df8cf6d52da12a7a1a4b3dbc (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=8c9b86fb1553924df8ea682c… http://github.com/ceki/logback/commit/8c9b86fb1553924df8ea682ca39ef336db272… commit 8c9b86fb1553924df8ea682ca39ef336db2725ae Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 16 18:24:54 2010 +0100 - pom.xml clean up - Fix LBACCESS-10 - TeeServletInputStreamm barfs on input over 8K diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 5b33824..b0e7ab3 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -2,17 +2,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> <version>0.9.27-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Access Module</name> diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java index 67fcca4..c544118 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java @@ -14,45 +14,66 @@ package ch.qos.logback.access.servlet; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; class TeeServletInputStream extends ServletInputStream { - InputStream in; - byte[] inputBuffer; - - TeeServletInputStream(HttpServletRequest request) { - duplicateInputStream(request); - } - - @Override - public int read() throws IOException { - return in.read(); - } - - private void duplicateInputStream(HttpServletRequest request) { - try { - int len = request.getContentLength(); - ServletInputStream originalSIS = request.getInputStream(); - if (len < 0) { - in = originalSIS; - } else { - inputBuffer = new byte[len]; - int n = originalSIS.read(inputBuffer, 0, len); - assert n == len; - this.in = new ByteArrayInputStream(inputBuffer); - originalSIS.close(); - } - } catch (IOException e) { - e.printStackTrace(); + InputStream in; + byte[] inputBuffer; + + TeeServletInputStream(HttpServletRequest request) { + duplicateInputStream(request); + } + + @Override + public int read() throws IOException { + return in.read(); } - } - byte[] getInputBuffer() { - return inputBuffer; - } + private void duplicateInputStream(HttpServletRequest request) { + ServletInputStream originalSIS = null; + try { + originalSIS = request.getInputStream(); + System.out.println("****************************************************"); + System.out.println("**************SIS type="+originalSIS.getClass().getName()); + inputBuffer = consumeBufferAndReturnAsByteArray(originalSIS); + this.in = new ByteArrayInputStream(inputBuffer); + } catch (IOException e) { + e.printStackTrace(); + } finally { + closeStrean(originalSIS); + } + } + + byte[] consumeBufferAndReturnAsByteArray(InputStream is) throws IOException { + int len = 1024; + byte[] temp = new byte[len]; + int c = -1; + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + while ((c = is.read(temp, 0, len)) != -1) { + baos.write(temp, 0, c); + } + return baos.toByteArray(); + } + + + void closeStrean(ServletInputStream is) { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + } + } + } + + byte[] getInputBuffer() { + return inputBuffer; + } } diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index c768bf4..f5dbbcb 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -2,17 +2,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> <version>0.9.27-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Classic Module</name> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 50659b0..d8b6207 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -2,17 +2,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> <version>0.9.27-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Core Module</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 6 +- .../access/servlet/TeeServletInputStream.java | 83 ++++++++++++------- logback-classic/pom.xml | 6 +- logback-core/pom.xml | 6 +- 4 files changed, 58 insertions(+), 43 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_0.9.25-31-g268c89d
by git-noreply＠pixie.qos.ch 15 Nov '10

15 Nov '10

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 268c89d8fe841c96df8cf6d52da12a7a1a4b3dbc (commit) from d786af4a6ee0b6f87d92678349ea5f7f7a9751de (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=268c89d8fe841c96df8cf6d5… http://github.com/ceki/logback/commit/268c89d8fe841c96df8cf6d52da12a7a1a4b3… commit 268c89d8fe841c96df8cf6d52da12a7a1a4b3dbc Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 15 17:16:44 2010 +0100 minor edit diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java index 25a9b62..67fcca4 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java @@ -31,7 +31,6 @@ class TeeServletInputStream extends ServletInputStream { @Override public int read() throws IOException { - //System.out.println("zzzzzzzzzz TeeServletInputStream.read called"); return in.read(); } ----------------------------------------------------------------------- Summary of changes: .../access/servlet/TeeServletInputStream.java | 1 - 1 files changed, 0 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_0.9.25-30-gd786af4
by git-noreply＠pixie.qos.ch 15 Nov '10

15 Nov '10

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 d786af4a6ee0b6f87d92678349ea5f7f7a9751de (commit) from 6fd071745b325bbf3cd8345a67b634895f6bb9bb (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=d786af4a6ee0b6f87d926783… http://github.com/ceki/logback/commit/d786af4a6ee0b6f87d92678349ea5f7f7a975… commit d786af4a6ee0b6f87d92678349ea5f7f7a9751de Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 15 15:07:58 2010 +0100 TeeFilter now takes include and exclude parameters so that it can be enabled or disabled by host. Added various defaults in ch/qos/logback/access/joran/JoranConfigurator diff --git a/logback-access/src/main/java/ch/qos/logback/access/AccessConstants.java b/logback-access/src/main/java/ch/qos/logback/access/AccessConstants.java index 107b928..9009aa8 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/AccessConstants.java +++ b/logback-access/src/main/java/ch/qos/logback/access/AccessConstants.java @@ -25,4 +25,11 @@ public class AccessConstants { public final static String IMAGE_JPEG = "image/jpeg"; public final static String IMAGE_GIF = "image/gif"; public final static String IMAGE_PNG = "image/png"; + + + + + public final static String TEE_FILTER_INCLUDES_PARAM = "includes"; + public final static String TEE_FILTER_EXCLUDES_PARAM = "excludes"; + } diff --git a/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java b/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java index 3b1c45a..2b255ad 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java +++ b/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java @@ -15,10 +15,14 @@ package ch.qos.logback.access.joran; import ch.qos.logback.access.PatternLayout; +import ch.qos.logback.access.PatternLayoutEncoder; +import ch.qos.logback.access.boolex.JaninoEventEvaluator; import ch.qos.logback.access.joran.action.ConfigurationAction; import ch.qos.logback.access.joran.action.EvaluatorAction; import ch.qos.logback.access.sift.SiftAction; import ch.qos.logback.core.AppenderBase; +import ch.qos.logback.core.UnsynchronizedAppenderBase; +import ch.qos.logback.core.filter.EvaluatorFilter; import ch.qos.logback.core.joran.JoranConfiguratorBase; import ch.qos.logback.core.joran.action.AppenderRefAction; import ch.qos.logback.core.joran.action.NOPAction; @@ -51,6 +55,11 @@ public class JoranConfigurator extends JoranConfiguratorBase { protected void addDefaultNestedComponentRegistryRules( DefaultNestedComponentRegistry registry) { registry.add(AppenderBase.class, "layout", PatternLayout.class); + registry + .add(EvaluatorFilter.class, "evaluator", JaninoEventEvaluator.class); + + registry.add(AppenderBase.class, "encoder", PatternLayoutEncoder.class); + registry.add(UnsynchronizedAppenderBase.class, "encoder", PatternLayoutEncoder.class); } } diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java index 3469403..3d2b44b 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java @@ -14,6 +14,10 @@ package ch.qos.logback.access.servlet; import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -24,48 +28,112 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import ch.qos.logback.access.AccessConstants; +import static ch.qos.logback.access.AccessConstants.LB_OUTPUT_BUFFER; +import static ch.qos.logback.access.AccessConstants.TEE_FILTER_INCLUDES_PARAM; +import static ch.qos.logback.access.AccessConstants.TEE_FILTER_EXCLUDES_PARAM; + public class TeeFilter implements Filter { - public void destroy() { - // NOP - } - - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain filterChain) throws IOException, ServletException { - - if (request instanceof HttpServletRequest) { - try { - TeeHttpServletRequest teeRequest = new TeeHttpServletRequest( - (HttpServletRequest) request); - TeeHttpServletResponse teeResponse = new TeeHttpServletResponse( - (HttpServletResponse) response); - - //System.out.println("BEFORE TeeFilter. filterChain.doFilter()"); - filterChain.doFilter(teeRequest, teeResponse); - //System.out.println("AFTER TeeFilter. filterChain.doFilter()"); - - teeResponse.finish(); - // let the output contents be available for later use by - // logback-access-logging - teeRequest.setAttribute(AccessConstants.LB_OUTPUT_BUFFER, teeResponse - .getOutputBuffer()); - } catch (IOException e) { - e.printStackTrace(); - throw e; - } catch (ServletException e) { - e.printStackTrace(); - throw e; - } - } else { - filterChain.doFilter(request, response); + boolean active; + + public void destroy() { + // NOP } - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain filterChain) throws IOException, ServletException { + + if (active && request instanceof HttpServletRequest) { + try { + TeeHttpServletRequest teeRequest = new TeeHttpServletRequest( + (HttpServletRequest) request); + TeeHttpServletResponse teeResponse = new TeeHttpServletResponse( + (HttpServletResponse) response); + + //System.out.println("BEFORE TeeFilter. filterChain.doFilter()"); + filterChain.doFilter(teeRequest, teeResponse); + //System.out.println("AFTER TeeFilter. filterChain.doFilter()"); + + teeResponse.finish(); + // let the output contents be available for later use by + // logback-access-logging + teeRequest.setAttribute(LB_OUTPUT_BUFFER, teeResponse + .getOutputBuffer()); + } catch (IOException e) { + e.printStackTrace(); + throw e; + } catch (ServletException e) { + e.printStackTrace(); + throw e; + } + } else { + filterChain.doFilter(request, response); + } + + } + + public void init(FilterConfig filterConfig) throws ServletException { + String includeListAsStr = filterConfig.getInitParameter(TEE_FILTER_INCLUDES_PARAM); + String excludeListAsStr = filterConfig.getInitParameter(TEE_FILTER_EXCLUDES_PARAM); + String localhostName = getLocalhostName(); + + active = computeActivation(localhostName, includeListAsStr, excludeListAsStr); + if (active) + System.out.println("TeeFilter will be ACTIVE on this host [" + localhostName + "]"); + else + System.out.println("TeeFilter will be DISABLED on this host [" + localhostName + "]"); + + } + + static List<String> extractNameList(String nameListAsStr) { + List<String> nameList = new ArrayList<String>(); + if (nameListAsStr == null) { + return nameList; + } + + nameListAsStr = nameListAsStr.trim(); + if (nameListAsStr.length() == 0) { + return nameList; + } - public void init(FilterConfig arg0) throws ServletException { - // NOP - } + String[] nameArray = nameListAsStr.split("[,;]"); + for (String n : nameArray) { + n = n.trim(); + nameList.add(n); + } + return nameList; + } + + + static String getLocalhostName() { + String hostname = "127.0.0.1"; + + try { + hostname = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException uhe) { + uhe.printStackTrace(); + } + return hostname; + } + + static boolean computeActivation(String hostname, String includeListAsStr, String excludeListAsStr) { + List<String> includeList = extractNameList(includeListAsStr); + List<String> excludeList = extractNameList(excludeListAsStr); + boolean inIncludesList = mathesIncludesList(hostname, includeList); + boolean inExcludesList = mathesExcludesList(hostname, excludeList); + return inIncludesList && (!inExcludesList); + } + + + static boolean mathesIncludesList(String hostname, List<String> includeList) { + if (includeList.isEmpty()) return true; + return includeList.contains(hostname); + } + + static boolean mathesExcludesList(String hostname, List<String> excludesList) { + if (excludesList.isEmpty()) return false; + return excludesList.contains(hostname); + } } diff --git a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java index 255c095..ee455f3 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java @@ -23,6 +23,7 @@ import org.junit.runners.Suite.SuiteClasses; ch.qos.logback.access.pattern.PackageTest.class, ch.qos.logback.access.jetty.PackageTest.class, ch.qos.logback.access.filter.PackageTest.class, + ch.qos.logback.access.servlet.PackageTest.class, ch.qos.logback.access.sift.PackageTest.class }) public class AllAccessTest { diff --git a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java b/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java similarity index 61% copy from logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java copy to logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java index 255c095..22ce2cc 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java @@ -11,19 +11,15 @@ * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. */ -package ch.qos.logback.access; +package ch.qos.logback.access.servlet; +import ch.qos.logback.access.filter.StatsByDayTest; +import junit.framework.TestCase; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { ch.qos.logback.access.spi.PackageTest.class, - ch.qos.logback.access.net.PackageTest.class, - ch.qos.logback.access.pattern.PackageTest.class, - ch.qos.logback.access.jetty.PackageTest.class, - ch.qos.logback.access.filter.PackageTest.class, - ch.qos.logback.access.sift.PackageTest.class }) -public class AllAccessTest { - -} +(a)SuiteClasses({TeeFilterTest.class}) +public class PackageTest extends TestCase { +} \ No newline at end of file diff --git a/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java b/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java new file mode 100644 index 0000000..f550de5 --- /dev/null +++ b/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java @@ -0,0 +1,57 @@ +package ch.qos.logback.access.servlet; + +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; + +public class TeeFilterTest { + + + @Test + public void extractNameList() { + assertEquals(Arrays.asList(new String[]{"a"}), TeeFilter.extractNameList("a")); + assertEquals(Arrays.asList(new String[]{"a", "b"}), TeeFilter.extractNameList("a, b")); + assertEquals(Arrays.asList(new String[]{"a", "b"}), TeeFilter.extractNameList("a; b")); + assertEquals(Arrays.asList(new String[]{"a", "b", "c"}), TeeFilter.extractNameList("a; b, c")); + } + + @Test + public void defaultCase() { + assertTrue(TeeFilter.computeActivation("somehost", "", "")); + assertTrue(TeeFilter.computeActivation("somehost", null, null)); + } + + @Test + public void withIncludesOnly() { + assertTrue(TeeFilter.computeActivation("a", "a", null)); + assertTrue(TeeFilter.computeActivation("a", "a, b", null)); + assertFalse(TeeFilter.computeActivation("a", "b", null)); + assertFalse(TeeFilter.computeActivation("a", "b, c", null)); + } + + + @Test + public void withExcludesOnly() { + assertFalse(TeeFilter.computeActivation("a", null, "a")); + assertFalse(TeeFilter.computeActivation("a", null, "a, b")); + assertTrue(TeeFilter.computeActivation("a", null, "b")); + assertTrue(TeeFilter.computeActivation("a", null, "b, c")); + } + + + @Test + public void withIncludesAndExcludes() { + assertFalse(TeeFilter.computeActivation("a", "a", "a")); + assertTrue(TeeFilter.computeActivation("a", "a", "b")); + assertFalse(TeeFilter.computeActivation("a", "b", "a")); + assertFalse(TeeFilter.computeActivation("a", "b", "b")); + + } + +} diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 555f7d7..86a5035 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -44,6 +44,9 @@ requested by Michael Osipov. </p> + <p><code>TeeFilter</code> now takes include and exclude parameters + so that it can be enabled or disabled by host.</p> + <h3>20th of October, 2010 - Release of version 0.9.26</h3> ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/access/AccessConstants.java | 7 + .../logback/access/joran/JoranConfigurator.java | 9 ++ .../ch/qos/logback/access/servlet/TeeFilter.java | 142 +++++++++++++++----- .../java/ch/qos/logback/access/AllAccessTest.java | 1 + .../access/{net => servlet}/PackageTest.java | 6 +- .../qos/logback/access/servlet/TeeFilterTest.java | 57 ++++++++ logback-site/src/site/pages/news.html | 3 + 7 files changed, 185 insertions(+), 40 deletions(-) copy logback-access/src/test/java/ch/qos/logback/access/{net => servlet}/PackageTest.java (84%) create mode 100644 logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-232) %n is necessary to separate real message from exception stack trace
by Michael Osipov (JIRA) 10 Nov '10

10 Nov '10

%n is necessary to separate real message from exception stack trace ------------------------------------------------------------------- Key: LBCLASSIC-232 URL: http://jira.qos.ch/browse/LBCLASSIC-232 Project: logback-classic Issue Type: Bug Components: layout Affects Versions: 0.9.26 Reporter: Michael Osipov Assignee: Logback dev list I started using the SMTPAppender and defined this pattern layout: <Pattern>Zeitstempel: %date%(%n)Kontext: %contextName%(%n)Angeforderte URI: %X{req.requestURI}%(%n)QueryString: %X{req.queryString}%(%n)Nachricht: %msg</Pattern> I do receive single log messages only so I don't need a %n at the end. Unfortunately, my log messages are messed up. Instead of: Nachricht: <msg> <ex> as the default log layout, I get: Nachricht: <msg><ex> I added a %n and it solved the problem. I was able to reproduce this with the FileAppender but this behavior make no sense. The exception is part of the message and should always include a \n internally unless a %ex is exlicitly defined. The last %n includes two line feed at once. -- 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_0.9.25-29-g6fd0717
by git-noreply＠pixie.qos.ch 09 Nov '10

09 Nov '10

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 6fd071745b325bbf3cd8345a67b634895f6bb9bb (commit) from 32168a310cd48e5920d7b03dc23e88f15496c528 (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=6fd071745b325bbf3cd8345a… http://github.com/ceki/logback/commit/6fd071745b325bbf3cd8345a67b634895f6bb… commit 6fd071745b325bbf3cd8345a67b634895f6bb9bb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 9 22:06:51 2010 +0100 minor editing diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 0988a9c..ffce20e 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -81,6 +81,7 @@ <li><a href="http://www.opengda.org/">OpenGDA</a></li> <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> <li><a href="http://liftweb.net/">Lift</a></li> + <li><a href="http://opentsdb.net/overview.html">OpenTSDB</a></li> <li><a href="http://www.red5.org">Red5</a></li> <li><a href="http://scalate.fusesource.org/">Scalate</a></li> </ul> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index b666ef3..555f7d7 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -39,9 +39,9 @@ </p> <p>Every context now returns its own name when asked for the - property CONTEXT_<code>NAME</code>. This addresses <a + property <code>CONTEXT_NAME</code>. This fixes <a href="http://jira.qos.ch/browse/LBCORE-178">LBCORE-178</a> as - reported by Michael Osipov. + requested by Michael Osipov. </p> <h3>20th of October, 2010 - Release of version 0.9.26</h3> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 1 + logback-site/src/site/pages/news.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-178) Add contextName as property to the context
by Michael Osipov (JIRA) 09 Nov '10

09 Nov '10

Add contextName as property to the context ------------------------------------------ Key: LBCORE-178 URL: http://jira.qos.ch/browse/LBCORE-178 Project: logback-core Issue Type: Improvement Components: Other Affects Versions: 0.9.26 Reporter: Michael Osipov Assignee: Logback dev list By default the hostname is available thru ${HOSTNAME}. This is really handy. It would be handy too, to have the context name as ${CONTEXTNAME] property through out the config 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

2 2

[JIRA] Created: (LBCORE-180) conversion word followed by a non-conversion word caues an exception
by Michael Osipov (JIRA) 09 Nov '10

09 Nov '10

conversion word followed by a non-conversion word caues an exception -------------------------------------------------------------------- Key: LBCORE-180 URL: http://jira.qos.ch/browse/LBCORE-180 Project: logback-core Issue Type: Bug Components: Pattern Affects Versions: 0.9.26 Reporter: Michael Osipov Assignee: Logback dev list I have defined the following pattern: <Pattern>Zeitstempel: %date%nKontext: %contextName%nAngeforderte URI: %X{req.requestURI}%nQueryString: %X{req.queryString}%nNachricht: %msg</Pattern> It is intended for a SMTPAppender. The outcome is: Zeitstempel: 2010-11-08 12:49:54,241%PARSER_ERROR_nKontext: michael%PARSER_ERROR_nAngeforderte URI: /michael/start%PARSER_ERROR_nQueryString: %PARSER_ERROR_nNachricht: Login:: ms.... The workaround is either enclose the %n in %() or put a space between. Anyway, this should be fixed or noted in the docs. -- 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