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

svn commit: r1468 - in logback/trunk/logback-site/src/site/pages: . images manual templates
by noreply.ceki＠qos.ch 27 Mar '07

27 Mar '07

Author: ceki Date: Tue Mar 27 20:41:04 2007 New Revision: 1468 Added: logback/trunk/logback-site/src/site/pages/images/ logback/trunk/logback-site/src/site/pages/images/qoslogo.gif (contents, props changed) logback/trunk/logback-site/src/site/pages/templates/creative.js Modified: logback/trunk/logback-site/src/site/pages/access.html logback/trunk/logback-site/src/site/pages/manual/layouts.html logback/trunk/logback-site/src/site/pages/news.html Log: doc updates Modified: logback/trunk/logback-site/src/site/pages/access.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/access.html (original) +++ logback/trunk/logback-site/src/site/pages/access.html Tue Mar 27 20:41:04 2007 @@ -25,50 +25,19 @@ </div> - <table> - <tr> - <td valign="top" align="top"> - <a rel="license" - href="http://creativecommons.org/licenses/by-nc-sa/2.5/"> - <img alt="Creative Commons License" - style="border-width: 0" - src="http://creativecommons.org/images/public/somerights20.png" /> - </a> - </td> - <td> - <p>Copyright © 2000-2006, QOS.ch</p> - - <p> -  - This work is licensed under a - <a rel="license" - href="http://creativecommons.org/licenses/by-nc-sa/2.5/"> - Creative Commons - Attribution-NonCommercial-ShareAlike 2.5 - License - </a> - . -  - </p> - </td> - </tr> - </table> - - - <h2>Introduction</h2> - - <p> - Logback was designed as a modular framework from the start. Being - able to use logback's internal core in many situations, without - heavy coding or complex specific configuration was one of our - goals. - </p> + <script src="../templates/creative.js"></script> - <p> - Lobgack access integrates with Servlet containers such as Jetty - and Tomcat to provide HTTP-access log functionality. + <h1>Introduction</h1> + + <p>Logback was designed as a modular framework from the + start. Making logback-core reusable under different + circumstances, without too much coding was one of our main + goals. As such, logback-access builds on top of logback-core. It + fully integrates with Servlet containers such as Jetty or Tomcat + to provide HTTP-access log functionality. </p> + <a name="tomcat"></a> <h2>Logback Access and Tomcat</h2> <p> @@ -82,40 +51,38 @@ <h3>LogbackValve</h3> - <p> - The <a href="xref/ch/qos/logback/access/tomcat/LogbackValve.html"> - <code>ch.qos.logback.access.tomcat.LogbackValve</code></a> - class extends Tomcat's <code><a + <p>The <a + href="xref/ch/qos/logback/access/tomcat/LogbackValve.html"> + <code>ch.qos.logback.access.tomcat.LogbackValve</code></a> class + extends Tomcat's <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/org/apache/catali…"> - ValveBase</a></code> - class. This class is used to allow external + ValveBase</a></code> class. This class is used to allow external components to be integrated into Tomcat. </p> - <p> - To configure Tomcat in order to use - <code>LogbackValve</code>, add the following lines - to the tomcat server configuration file, namely <em>$TOMCAT_HOME/conf/server.xml</em>: + <p>To configure Tomcat in order to use <code>LogbackValve</code>, + add the following lines to the tomcat server configuration file, + namely <em>$TOMCAT_HOME/conf/server.xml</em>: </p> <div class="source"><pre><Valve className="ch.qos.logback.access.tomcat.LogbackValve"/></pre></div> - <p> - This line need to be nested in an <em>Engine</em> element. + + <p>This line need to be nested in an <em>Engine</em> element. </p> - <p> - By default, <code>LogbackValve</code> looks for a logback + + <p>By default, <code>LogbackValve</code> looks for a logback configuration file called <em>logback-access.xml</em>, in the - same folder where <em>server.xml</em> is located, that is - in <em>$TOMCAT_HOME/conf/</em>. This - configuration file contains directives for configuring logback - components. Among others, you can specify the appenders where - the logging requests will be sent, and their format. Please refer - to the description below about logback access configuration for examples. + same folder where <em>server.xml</em> is located, that is in + <em>$TOMCAT_HOME/conf/</em>. This configuration file contains + directives for configuring logback components. Among others, you + can specify the appenders where the logging requests will be + sent, and their format. Please refer to the description below + about logback access configuration for examples. </p> + <a name="jetty"></a> <h2>Logback Access and Jetty</h2> - <p> - To use logback-access with Jetty, after downlading the logback + <p>To use logback-access with Jetty, after downlading the logback distribution, place the files <em>logback-core-VERSION.jar</em> and <em>logback-access-VERSION.jar</em> under $JETTY_HOME/lib directory, where $JETTY_HOME is the folder where you have @@ -125,8 +92,8 @@ <h3>Logback's RequestLog implementation</h3> - <p> - The <a href="xref/ch/qos/logback/access/jetty/RequestLogImpl.html"> + <p>The <a + href="xref/ch/qos/logback/access/jetty/RequestLogImpl.html"> <code>ch.qos.logback.access.jetty.RequestLogImpl</code></a> class implements jetty's <code><a href="http://jetty.mortbay.org/apidocs/org/mortbay/jetty/RequestLog.html">RequestLog</a></code> @@ -134,16 +101,15 @@ components to manage request logging. </p> - <p> - In logback, logging destinations are called Appenders. These classes - can be attached directly to <code>RequestLogImpl</code>. + <p>In logback, logging destinations are called Appenders. These + classes can be attached directly to <code>RequestLogImpl</code>. </p> - <p> - To configure jetty in order to use logback's - <code>RequestLogImpl</code>, add the following lines - to the jetty configuration file, namely <em>$JETTY_HOME/etc/jetty.xml</em>: + <p>To configure jetty in order to use logback's + <code>RequestLogImpl</code>, add the following lines to the + jetty configuration file, namely + <em>$JETTY_HOME/etc/jetty.xml</em>: </p> <div class="source"><pre><Ref id="requestLog"> <Set name="requestLog"> @@ -152,25 +118,27 @@ </New> </Set> </Ref></pre></div> - <p> - These lines reference the requestLog functionnality of Jetty, setting - the actual class that will be called at each logging request. + + <p>These lines reference the requestLog functionnality of Jetty, + setting the actual class that will be called at each logging + request. </p> - <p> - By default, <code>RequestLogImpl</code> looks for a logback - configuration file called <em>logback-access.xml</em>, in the - same folder where <em>jetty.xml</em> is located. This - configuration file contains directives for configuring logback - components. Among others, you can specify the appenders where - the logging requests will be sent, and their format. - </p> + + <p>By default, <code>RequestLogImpl</code> looks for a logback + configuration file called <em>logback-access.xml</em>, in the same + folder where <em>jetty.xml</em> is located. This configuration + file contains directives for configuring logback components. Among + others, you can specify the appenders where the logging requests + will be sent, and their format. + </p> <p>As long the path is specified, you can place the logback - configuration file in any location. Here is another example of - jetty configuration file, with a path to the logback access - configuration file. + configuration file in any location. Here is another example of + jetty configuration file, with a path to the logback access + configuration file. </p> - <div class="source"><pre><Ref id="requestLog"> + + <div class="source"><pre><Ref id="requestLog"> <Set name="requestLog"> <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"> Added: logback/trunk/logback-site/src/site/pages/images/qoslogo.gif ============================================================================== Binary file. No diff available. Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Tue Mar 27 20:41:04 2007 @@ -1707,9 +1707,8 @@ <tr class="a"> <td align="center"><b>fullRequest</b></td> <td> - <p> - This conversion word takes all the available headers of the - request and displays their values. + <p>This converter outputs the data associated with the + request, including all headers and request contents. </p> </td> </tr> @@ -1733,8 +1732,9 @@ <td align="center"><b>fullResponse</b></td> <td> <p> - This conversion word takes all the available headers of the - response and displays their values. + This conversion word takes all the available data + associatede with the response, inclusing all headers of the + response and response contents. </p> </td> </tr> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Tue Mar 27 20:41:04 2007 @@ -28,10 +28,14 @@ <hr width="80%" align="center" /> - <h3>MMMMM DDth, 2007 - Release of version 0.9.X</h3> + <h3>xxxx , 2007 - Release of version 0.9.4</h3> - <p> - what's new... + <p>Significant bug fixes made to <code>TeeFilter</code> and + Co. located in the logback-access module. Images and other binary + files are now intercepted and replayed correctly. As for + "x-www-form-urlencoded" post requests, their input buffer is left + untouched. In a best-effort attempt, the input buffer is later + reconstructed. However, it may differ from the original. </p> <h3>March 20th, 2007 - Release of version 0.9.3</h3> Added: logback/trunk/logback-site/src/site/pages/templates/creative.js ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/pages/templates/creative.js Tue Mar 27 20:41:04 2007 @@ -0,0 +1,33 @@ +document.write(' <table style="margin-left: 0em; padding-top=0ex" cellpadding="0" '); +document.write(' cellspacing="0" width="70%">'); +document.write(' <tr>'); +document.write(' <td> '); +document.write(' <p class="author">'); +document.write(' Authors: Ceki Gülcü, Sébastien Pennec'); +document.write(' <br/>'); +document.write(' Copyright © 2000-2006, QOS.ch</p>'); +document.write(' </td>'); +document.write(' <td>'); +document.write(' <a rel="license"'); +document.write(' href="http://creativecommons.org/licenses/by-nc-sa/2.5/">'); +document.write(' <img alt="Creative Commons License"'); +document.write(' style="border-width: 0; margin-left: 1em"'); +document.write(' src="http://creativecommons.org/images/public/somerights20.png" />'); +document.write(' </a>'); +document.write(' </td>'); +document.write(' </tr>'); +document.write(' <tr>'); +document.write(' <td>'); +document.write(' <p>'); +document.write(' This document is licensed under a'); +document.write(' <a rel="license"'); +document.write(' href="http://creativecommons.org/licenses/by-nc-sa/2.5/">'); +document.write(' Creative Commons'); +document.write(' Attribution-NonCommercial-ShareAlike 2.5'); +document.write(' License'); +document.write(' </a>'); +document.write(' </p>'); +document.write(' </td>'); +document.write(' <td></td>'); +document.write(' </tr>'); +document.write(' </table>');

1 0

svn commit: r1467 - logback/trunk/logback-examples
by noreply.ceki＠qos.ch 27 Mar '07

27 Mar '07

Author: ceki Date: Tue Mar 27 20:10:47 2007 New Revision: 1467 Modified: logback/trunk/logback-examples/ (props changed) Log: ignored file

1 0

svn commit: r1466 - in logback/trunk/logback-access/src/main/java/ch/qos/logback/access: . servlet spi
by noreply.ceki＠qos.ch 27 Mar '07

27 Mar '07

Author: ceki Date: Tue Mar 27 20:05:05 2007 New Revision: 1466 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Log: Significantly more robust TeeFilter. This version does not barf - on images, css files etc. - application/x-www-form-urlencoded requests If the request is application/x-www-form-urlencoded, TeeFilter attempts to recreate the input altough it might be able to do so only approximately Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java Tue Mar 27 20:05:05 2007 @@ -3,4 +3,6 @@ public class Constants { public static final String LB_INPUT_BUFFER = "LB_INPUT_BUFFER"; public static final String LB_OUTPUT_BUFFER = "LB_OUTPUT_BUFFER"; + + public final static String X_WWW_FORM_URLECODED = "application/x-www-form-urlencoded"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java Tue Mar 27 20:05:05 2007 @@ -19,27 +19,51 @@ private TeeServletInputStream inStream; private BufferedReader reader; + boolean postedParametersMode = false; TeeHttpServletRequest(HttpServletRequest request) { super(request); - inStream = new TeeServletInputStream(request); - // add the contents of the input buffer as an attribute of the request in byte[] format - request.setAttribute(Constants.LB_INPUT_BUFFER, inStream.getInputBuffer()); - reader = new BufferedReader(new InputStreamReader(inStream)); + 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(Constants.LB_INPUT_BUFFER, inStream.getInputBuffer()); + reader = new BufferedReader(new InputStreamReader(inStream)); + } + } - + byte[] getInputBuffer() { + if (postedParametersMode) { + throw new IllegalStateException("Call disallowed in postedParametersMode"); + } return inStream.getInputBuffer(); } @Override public ServletInputStream getInputStream() throws IOException { - return inStream; + if (!postedParametersMode) { + return inStream; + } else { + return super.getInputStream(); + } } + // + @Override public BufferedReader getReader() throws IOException { - return reader; + if (!postedParametersMode) { + return reader; + } else { + return super.getReader(); + } } - + + public boolean isPostedParametersMode() { + return postedParametersMode; + } + } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java Tue Mar 27 20:05:05 2007 @@ -15,7 +15,6 @@ public TeeHttpServletResponse(HttpServletResponse httpServletResponse) { super(httpServletResponse); - // System.out.println("TeeHttpServletResponse.constructor called"); } @Override @@ -28,7 +27,6 @@ @Override public PrintWriter getWriter() throws IOException { - // System.out.println("TeeHttpServletResponse.getWriter() called"); if (this.writer == null) { this.writer = new PrintWriter(new OutputStreamWriter(getOutputStream()), true); @@ -38,14 +36,14 @@ @Override public void flushBuffer() { - // System.out.println("TeeHttpServletResponse.flushBuffer() called"); - if(this.writer != null) { + if (this.writer != null) { this.writer.flush(); } } byte[] getOutputBuffer() { - // teeServletOutputStream can be null if the getOutputStream method is never called. + // teeServletOutputStream can be null if the getOutputStream method is never + // called. if (teeServletOutputStream != null) { return teeServletOutputStream.getOutputBuffer(); } else { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java Tue Mar 27 20:05:05 2007 @@ -19,6 +19,7 @@ @Override public int read() throws IOException { + System.out.println("zzzzzzzzzz TeeServletInputStream.read called"); return in.read(); } @@ -35,7 +36,7 @@ while ((n = originalSIS.read(inputBuffer, 0, len)) != -1) { baos.write(inputBuffer, 0, n); } - this.in = new ByteArrayInputStream(inputBuffer); + this.in = new ByteArrayInputStream(inputBuffer); originalSIS.close(); } } catch (IOException e) { Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java Tue Mar 27 20:05:05 2007 @@ -15,11 +15,6 @@ throws IOException { // System.out.println("TeeServletOutputStream.constructor() called"); this.underlyingStream = httpServletResponse.getOutputStream(); - if (underlyingStream == null) { - System.out.println("XXXXX underlyingStream == null"); - } else { - System.out.println("XXXXX underlyingStream != null"); - } baos = new ByteArrayOutputStream(); } @@ -29,8 +24,6 @@ @Override public void write(int val) throws IOException { - // System.out.println("XXXXXXXXXXXWRITE TeeServletOutputStream.write(int) - // called"); if (underlyingStream != null) { underlyingStream.write(val); baos.write(val); @@ -69,7 +62,6 @@ } public void finish() throws IOException { - // System.out.println("FINISH TeeServletOutputStream.close() called"); flush(); underlyingStream.close(); baos.close(); Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java Tue Mar 27 20:05:05 2007 @@ -0,0 +1,17 @@ +package ch.qos.logback.access.servlet; + +import javax.servlet.http.HttpServletRequest; + +import ch.qos.logback.access.Constants; + +public class Util { + + public static boolean isFormUrlEncoded(HttpServletRequest request) { + if ("POST".equals(request.getMethod()) + && Constants.X_WWW_FORM_URLECODED.equals(request.getContentType())) { + return true; + } else { + return false; + } + } +} Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Tue Mar 27 20:05:05 2007 @@ -12,6 +12,7 @@ import ch.qos.logback.access.Constants; import ch.qos.logback.access.pattern.AccessConverter; +import ch.qos.logback.access.servlet.Util; /** * The Access module's internal representation of logging events. When the @@ -43,7 +44,7 @@ String serverName; String requestContent; String responseContent; - + Map<String, String> requestHeaderMap; Map<String, Object> requestParameterMap; @@ -252,7 +253,7 @@ public List<String> getResponseHeaderNameList() { return serverAdapter.getResponseHeaderNameList(); } - + /** * Attributes are not serialized * @@ -321,19 +322,55 @@ return statusCode; } + @SuppressWarnings("unchecked") public String getRequestContent() { if (requestContent != null) { return requestContent; } - // retreive the byte array placed by TeeFilter - byte[] inputBuffer = (byte[]) httpRequest.getAttribute(Constants.LB_INPUT_BUFFER); - if (inputBuffer != null) { - requestContent = new String(inputBuffer); - } + if (Util.isFormUrlEncoded(httpRequest)) { + StringBuffer buf = new StringBuffer(); + + Enumeration pramEnumeration = httpRequest.getParameterNames(); + + // example: id=1234&user=cgu + // number=1233&x=1 + int count = 0; + try { + while(pramEnumeration.hasMoreElements()) { + + + String key = (String) pramEnumeration.nextElement(); + if (count++ != 0) { + buf.append("&"); + } + buf.append(key); + buf.append("="); + String val = httpRequest.getParameter(key); + if(val != null) { + buf.append(val); + } else { + buf.append(""); + } + } + } catch (Exception e) { + // FIXME Why is try/catch required? + e.printStackTrace(); + } + requestContent = buf.toString(); + } else { - if (requestContent == null || requestContent.length() == 0) { - requestContent = EMPTY; + // retreive the byte array placed by TeeFilter + byte[] inputBuffer = (byte[]) httpRequest + .getAttribute(Constants.LB_INPUT_BUFFER); + + if (inputBuffer != null) { + requestContent = new String(inputBuffer); + } + + if (requestContent == null || requestContent.length() == 0) { + requestContent = EMPTY; + } } return requestContent; @@ -344,7 +381,8 @@ return responseContent; } // retreive the byte array previously placed by TeeFilter - byte[] outputBuffer = (byte[]) httpRequest.getAttribute(Constants.LB_OUTPUT_BUFFER); + byte[] outputBuffer = (byte[]) httpRequest + .getAttribute(Constants.LB_OUTPUT_BUFFER); if (outputBuffer != null) { responseContent = new String(outputBuffer); @@ -356,6 +394,7 @@ return responseContent; } + public int getLocalPort() { if (localPort == SENTINEL) { if (httpRequest != null) {

1 0

svn commit: r1465 - in logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse: actions dialog model reciever views
by noreply.seb＠qos.ch 27 Mar '07

27 Mar '07

Author: seb Date: Tue Mar 27 19:51:12 2007 New Revision: 1465 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/actions/LogbackPreferencesAction.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/LoggingEventManager.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LoggingEventContentProvider.java Log: Max number of events to store is now a preference. The list of logging events is now synchronized. The content provider now detects when the list has been stripped down and refreshes the whole viewer Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/actions/LogbackPreferencesAction.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/actions/LogbackPreferencesAction.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/actions/LogbackPreferencesAction.java Tue Mar 27 19:51:12 2007 @@ -7,6 +7,7 @@ import org.eclipse.swt.widgets.Shell; import ch.qos.logback.eclipse.dialog.LogbackPreferencesDialog; +import ch.qos.logback.eclipse.model.LoggingEventManager; import ch.qos.logback.eclipse.views.LogbackView; /** @@ -46,6 +47,10 @@ if (fontChanged(fd, dialog)) { view.updateFont(dialog.getFontName(), dialog.getFontSize()); } + + if (dialog.getListMaxSize() != LoggingEventManager.getManager().getMaxSize()) { + LoggingEventManager.getManager().setMaxSize(dialog.getListMaxSize()); + } } private boolean fontChanged(FontData[] fd, LogbackPreferencesDialog dialog) { Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java Tue Mar 27 19:51:12 2007 @@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import ch.qos.logback.eclipse.model.LoggingEventManager; + /** * A dialog that allows the user to change the pattern that is used to display * the logging events @@ -32,11 +34,13 @@ private int tmpServerPort = -1; private String fontName; private int fontSize; + private int listMaxSize; private Text patternField; private Text portField; private Combo fontCombo; private Text fontSizeField; + private Text maxSizeField; public LogbackPreferencesDialog(Shell parentShell, String namePattern, int serverPort, String fontName , int fontSize) { @@ -45,6 +49,7 @@ this.serverPort = serverPort; this.fontName = fontName; this.fontSize = fontSize; + this.listMaxSize = LoggingEventManager.getManager().getMaxSize(); setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL); } @@ -59,6 +64,7 @@ createPatternUIParts(container); createServerPortUIParts(container); createFontUIParts(container); + createListSizeUIParts(container); initContent(); @@ -114,6 +120,15 @@ fontSizeField = new Text(container, SWT.BORDER); fontSizeField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); } + + private void createListSizeUIParts(Composite container) { + final Label sizeLabel = new Label(container, SWT.None); + sizeLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); + sizeLabel.setText("Enter the maximum number of logs to display:"); + + maxSizeField = new Text(container, SWT.BORDER); + maxSizeField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); + } private void initContent() { patternField.setText(pattern != null ? pattern : ""); @@ -143,6 +158,13 @@ fontName = fontCombo.getItem(fontCombo.getSelectionIndex()); } }); + + maxSizeField.setText(String.valueOf(listMaxSize)); + maxSizeField.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + listMaxSize = Integer.parseInt(maxSizeField.getText()); + } + }); } protected void configureShell(Shell newShell) { @@ -165,6 +187,10 @@ public String getFontName() { return fontName; } + + public int getListMaxSize() { + return listMaxSize; + } @Override protected void okPressed() { Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/LoggingEventManager.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/LoggingEventManager.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/LoggingEventManager.java Tue Mar 27 19:51:12 2007 @@ -1,9 +1,11 @@ package ch.qos.logback.eclipse.model; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.concurrent.ScheduledExecutorService; + +import org.eclipse.ui.IMemento; import ch.qos.logback.classic.spi.LoggingEvent; @@ -13,16 +15,18 @@ * @author Sébastien Pennec */ public class LoggingEventManager { - + + private static final String TAG_MGR = "manager"; + private static final String TAG_MAXSIZE = "maxSize"; + private static final double REMOVE_RATIO = 0.33; + static LoggingEvent[] NONE = new LoggingEvent[] {}; - + private static LoggingEventManager manager; - private static final int MAX_SIZE = 100000; - private static final int MIN_SIZE = 50000; - private List<LoggingEvent> loggingEventList = new ArrayList<LoggingEvent>(); - private boolean sendingEvents = true; - ScheduledExecutorService scheduledExecutorService; + private int maxSize = 20000; + private int removeQuantity = 14000; + private List<LoggingEvent> loggingEventList = Collections.synchronizedList(new ArrayList<LoggingEvent>()); private List<LoggingEventManagerListener> listeners = new ArrayList<LoggingEventManagerListener>(); @@ -41,9 +45,7 @@ } loggingEventList.add(event); listSizeCheck(); - if (sendingEvents) { - sendEvent(event); - } + sendEvent(event); } private void sendEvent(LoggingEvent event) { @@ -68,9 +70,11 @@ } private void listSizeCheck() { - if (loggingEventList.size() > MAX_SIZE) { - List sub = loggingEventList.subList(0, MIN_SIZE); - loggingEventList.removeAll(sub); + synchronized(loggingEventList) { + if (loggingEventList.size() > maxSize) { + List sub = loggingEventList.subList(0, removeQuantity); + sub.clear(); + } } } @@ -79,10 +83,12 @@ } public LoggingEvent getEvent(int index) { - if (index > loggingEventList.size()-1) { - return null; + synchronized(loggingEventList) { + if (index > loggingEventList.size()-1) { + return null; + } + return loggingEventList.get(index); } - return loggingEventList.get(index); } public int getEventCount() { @@ -92,4 +98,32 @@ public int getIndex(LoggingEvent event) { return loggingEventList.indexOf(event); } + + public int getMaxSize() { + return maxSize; + } + + public void setMaxSize(int maxSize) { + this.maxSize = maxSize; + Double dbl = maxSize * REMOVE_RATIO; + this.removeQuantity = dbl.intValue(); + listSizeCheck(); + } + + public void saveState(IMemento memento) { + IMemento mem = memento.createChild(TAG_MGR); + mem.putInteger(TAG_MAXSIZE, maxSize); + } + + public void init(IMemento memento) { + IMemento mem = memento.getChild(TAG_MGR); + if (mem == null) { + return; + } + + Integer max = mem.getInteger(TAG_MAXSIZE); + if (max != null) { + this.maxSize = max; + } + } } Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java Tue Mar 27 19:51:12 2007 @@ -3,7 +3,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; -import java.net.UnknownHostException; import org.eclipse.ui.IMemento; Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Tue Mar 27 19:51:12 2007 @@ -242,6 +242,7 @@ EventFilter.saveState(memento); labelProvider.saveState(memento); server.saveState(memento); + LoggingEventManager.getManager().saveState(memento); IMemento mem = memento.createChild(TAG_DISPLAY); FontData[] fd = viewer.getTable().getFont().getFontData(); mem.putString(TAG_FONTNAME, fd[0].getName()); @@ -261,7 +262,7 @@ tmpFontSize = mem.getInteger(TAG_FONTSIZE); tmpFontName = mem.getString(TAG_FONTNAME); } - + LoggingEventManager.getManager().init(memento); } public Viewer getViewer() { Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LoggingEventContentProvider.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LoggingEventContentProvider.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LoggingEventContentProvider.java Tue Mar 27 19:51:12 2007 @@ -20,6 +20,7 @@ private TableViewer viewer; private boolean autoScroll = true; + private int lastCount = 0; public LoggingEventContentProvider(TableViewer viewer) { this.viewer = viewer; @@ -41,9 +42,14 @@ } private void updateViewer(final LoggingEventManagerEvent event) { - // we should *not* add an element to the viewer here! int count = LoggingEventManager.getManager().getEventCount(); viewer.setItemCount(count); + if (count < lastCount) { + //we've stripped down the list, we + //need to refresh the whole viewer + viewer.refresh(); + } + lastCount = count; if (event.getItemsAdded().length > 0 && autoScroll) { viewer.getTable().showItem(viewer.getTable().getItem(count - 1)); } @@ -71,6 +77,8 @@ public void updateElement(int index) { LoggingEvent event = LoggingEventManager.getManager().getEvent(index); - viewer.replace(event, index); + if (event != null) { + viewer.replace(event, index); + } } }

1 0

svn commit: r1464 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers
by noreply.seb＠qos.ch 27 Mar '07

27 Mar '07

Author: seb Date: Tue Mar 27 11:32:23 2007 New Revision: 1464 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CyclicBuffer.java Log: minor modification: the get() method now returns the generic type Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CyclicBuffer.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CyclicBuffer.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/CyclicBuffer.java Tue Mar 27 11:32:23 2007 @@ -82,7 +82,7 @@ * is outside the range 0 to the number of elements currently in the buffer, * then <code>null</code> is returned. */ - public Object get(int i) { + public E get(int i) { if (i < 0 || i >= numElems) return null;

1 0

svn commit: r1463 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 26 Mar '07

26 Mar '07

Author: ceki Date: Mon Mar 26 22:14:39 2007 New Revision: 1463 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Log: typo fix Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Mon Mar 26 22:14:39 2007 @@ -52,8 +52,7 @@ final private List<ContextListener> contextListenerList = new ArrayList<ContextListener>(); // We want loggerCache to be synchronized so Hashtable is a good choice. In - // practice, it - // performs a little faster than the map returned by + // practice, it performs a little faster than the map returned by // Collections.synchronizedMap at the // cost of a very slightly higher memory footprint. private Hashtable<String, Logger> loggerCache;

1 0

svn commit: r1462 - in logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse: reciever views
by noreply.seb＠qos.ch 26 Mar '07

26 Mar '07

Author: seb Date: Mon Mar 26 21:45:42 2007 New Revision: 1462 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Log: Displaying message in case of port already in use Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java Mon Mar 26 21:45:42 2007 @@ -3,6 +3,7 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; +import java.net.UnknownHostException; import org.eclipse.ui.IMemento; @@ -78,7 +79,15 @@ if (newPort != 0) { this.port = newPort; } - + } + + public boolean isPortFree() { + try { + Socket s = new Socket("localhost", port); + return !s.isConnected(); + } catch (Exception e) { + return true; + } } } Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Mon Mar 26 21:45:42 2007 @@ -8,6 +8,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; @@ -51,7 +52,7 @@ */ public class LogbackView extends ViewPart { - + private static final String TAG_DISPLAY = "display"; private static final String TAG_FONTNAME = "fontName"; private static final String TAG_FONTSIZE = "fontSize"; @@ -185,8 +186,7 @@ if (port != null) { server.setPort(port.intValue()); } - serverThread = new Thread(server); - serverThread.start(); + startServerThread(server); } @Override @@ -216,7 +216,6 @@ public void updateServerPort(Integer serverPort) { launchSocketServer(serverPort); - PluginLogger.logInfo("Now listening on port: " + serverPort); } private void initServer() { @@ -224,8 +223,18 @@ if (memento != null) { server.init(memento); } - serverThread = new Thread(server); - serverThread.start(); + startServerThread(server); + } + + private void startServerThread(SimpleSocketServer server) { + if (server.isPortFree()) { + serverThread = new Thread(server); + serverThread.start(); + PluginLogger.logInfo("Now listening on port: " + server.getPort()); + } else { + String errorMessage = "Unable to start SocketServer on port: " + server.getPort() + "."; + MessageDialog.openInformation(this.getSite().getShell(), "Logback View", errorMessage); + } } public void saveState(IMemento memento) { @@ -245,14 +254,14 @@ initServer(); if (memento != null) { IMemento mem = memento.getChild(TAG_DISPLAY); - if (mem == null) { + if (mem == null) { return; } - + tmpFontSize = mem.getInteger(TAG_FONTSIZE); tmpFontName = mem.getString(TAG_FONTNAME); } - + } public Viewer getViewer() { @@ -296,16 +305,16 @@ } return null; } - + public Font getFont() { return viewer.getTable().getFont(); } - + public void updateFont(String fontName, Integer fontSize) { if (fontName == null || fontSize == null) { return; } - + Font font = null; try { font = new Font(Display.getDefault(), fontName, fontSize, SWT.NORMAL);

1 0

svn commit: r1461 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet
by noreply.ceki＠qos.ch 26 Mar '07

26 Mar '07

Author: ceki Date: Mon Mar 26 21:41:11 2007 New Revision: 1461 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java Log: For images, it seems that getWriter() is never called, getOutputStream() is called instead. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java Mon Mar 26 21:41:11 2007 @@ -39,7 +39,9 @@ @Override public void flushBuffer() { // System.out.println("TeeHttpServletResponse.flushBuffer() called"); - this.writer.flush(); + if(this.writer != null) { + this.writer.flush(); + } } byte[] getOutputBuffer() {

1 0

svn commit: r1460 - in logback/trunk/logback-site/src/site: pages resources/images/plugin
by noreply.seb＠qos.ch 26 Mar '07

26 Mar '07

Author: seb Date: Mon Mar 26 21:26:30 2007 New Revision: 1460 Added: logback/trunk/logback-site/src/site/pages/consolePlugin.html logback/trunk/logback-site/src/site/resources/images/plugin/ logback/trunk/logback-site/src/site/resources/images/plugin/buttons.gif (contents, props changed) logback/trunk/logback-site/src/site/resources/images/plugin/createFilter.gif (contents, props changed) logback/trunk/logback-site/src/site/resources/images/plugin/filterWindow.gif (contents, props changed) logback/trunk/logback-site/src/site/resources/images/plugin/prefs.gif (contents, props changed) logback/trunk/logback-site/src/site/resources/images/plugin/sampleLogs.gif (contents, props changed) logback/trunk/logback-site/src/site/resources/images/plugin/stackTrace.gif (contents, props changed) Log: On going work on the plugin documentation Added: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Mon Mar 26 21:26:30 2007 @@ -0,0 +1,299 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> +<title>Logback Console Plugin for Eclipse</title> +<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> +<link rel="stylesheet" type="text/css" media="print" href="css/print.css" /> + +</head> +<body> + <script> +prefix=''; +</script> + +<script src="templates/header.js"></script> +<div id="left"> + <script src="templates/left.js"></script> +</div> +<div id="right"> + <script src="templates/right.js"></script> +</div> +<div id="content"> + + <h2>Logback Console Plugin for Eclipse</h2> + + <p> + When developping a product, it is often useful to print logs to the console. Logging requests + are displayed using a <code>PatternLayout</code>, and one can easily see what happens when the + product runs. + </p> + + <p> + The logback Console Plugin for Eclipse serves the same purpose, but offers several possibilities + that are not possible by using a simple output to the console. In short, here + are the key advantages of the logback plugin: + </p> + + <ul> + <li> + Filter logs using logback's powerful filtering mechanism without changing + your logging configuration + </li> + <li> + View stacktraces in Eclipse's own StackTrace Console effortlessly + </li> + <li> + Immediately see where a certain logging request was issued + </li> + <li> + Easy configuration (only one line in your <em>logback.xml</em> file) + </li> + </ul> + + <h3>Installation</h3> + + <p> + Installing the plugin requires few steps. First get the plugin from + our <a href="download.html">download page</a>. + </p> + + <p> + Once the transfert is complete, unzip the file called + <code>ch.qos.logback.eclipse_<em>VERSION</em>.zip</code>. Place the folder + found inside the archive in the following directory: <em>ECLIPSE_INSTALL/plugins/</em> + where <em>ECLIPSE_INSTALL</em> is the directory where you've installed Eclipse. + </p> + + <p> + Relaunching Eclipse should do the trick. To access the logback plugin, open + the following menu: <em>Window > Show view > Other... </em>. You should see + the <em>Logback View</em> nested in the <em>Logback</em> category. Selecting the + view will add it to your workspace. + </p> + + <h3>Logging to the logback plugin</h3> + + <p> + Logging to the logback plugin takes a single line of configuration + in your <em>logback.xml</em> configuration file, as you can see below. + </p> + + <div class="source"><pre><?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <consolePlugin /> + +</configuration></pre></div> + + <p> + This element will trigger the creation of a <code>SocketAppender</code> that will send + events to the localhost, on port <em>4321</em> by default. That's all it takes to run your + software and log to the logback plugin. + </p> + + <p>If you already have + a server running on the default port, you can specify the port that will be used + by adding a simple attribute to the xml element: + </p> + + <div class="source"><pre><?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <consolePlugin port="4567" /> + +</configuration></pre></div> + + <p> + In that case, however, you will need to specify in the plugin preferences on which + port to listen for events. The plugin preferences will be covered in the next section + of this document. + </p> + + <h3>Using the logback plugin</h3> + + <p> + Once the <em>Logback View</em> is shown on your workspace, you might want to + configure it to fit your needs. Look at the right side of the plugin view. + You should see two buttons, along with the usual three Eclipse icons: + </p> + + <img src="images/plugin/buttons.gif" /> + + <p> + The first button on the left clears the console. The second button toggles + the auto-scroll functionnality. When enabled, you will always see the latest + logs that have been recieved by the plugin. If you disable the auto scrolling, + the view will display the current logs, and add the new ones at the bottom of + the list. + </p> + + <p> + The third button opens a sub-menu that lets you configure the logback plugin. + </p> + + <p> + When your software logs events, they are displayed in the logback view as shown + below: + </p> + + <img src="images/plugin/sampleLogs.gif" /> + + <p> + All events with a level equal or higher to <em>WARN</em> are displayed in red. + </p> + + <p> + Double-clicking on a log entry will open a Java editor and show you the line + where the entry was requested. It is an easy way to be access directly + to the class and method that logged the selected entry. + </p> + + <p> + When an icon is shown on the left of the logging event, it means that the + logging event contains a stacktrace. Right-clicking on the line reveals + a sub-menu that lets you open Eclipse's StackTrace Console and display the + stacktrace. + </p> + + <img src="images/plugin/stackTrace.gif" /> + + <h3>Configuring the logback plugin</h3> + + <p> + On the right of the view, right next to the auto-scroll toggle is + a button that opens a sub menu. + </p> + + <h4>Preferences</h4> + + <p> + The first item in this menu opens the plugin's preference window. + </p> + + <img src="images/plugin/prefs.gif" /> + + <p> + In this window, you can configure the pattern that will be used by the plugin + to display the logs. By default, it is configured to show the following informations: + </p> + + <ul> + <li> + Relative time since launch + </li> + <li> + Level of the request + </li> + <li> + The thread name + </li> + <li> + Name of the logger. The name is automatically shortened when longer than + 25 characters + </li> + <li> + The message of the request + </li> + </ul> + + <p> + An important point about this pattern is that, if it is modified, the changes + are immediately reflected on the <strong>current content</strong> of the logback view. + That means that if you would like to display an <code>MDC</code> value, or any other + information that the <code>PatternLayout</code> provides, you can change it even + <em>after</em> the logs have been requested. + </p> + + <p> + Along with the pattern, you can specify the port on which the plugin will listen + for logging events. You can also choose the font type and size that will be used + to display the logs in the logback view. + </p> + + + <h4>Filters</h4> + + <p> + The logback plugin lets you filter logging events when they are + recieved. It uses the powerfull <code>EvaluatorFilter</code>objects + that are available in logback. For detailled information about these filters, you might want + to check the <a href="manual/filters.html">corresponding documentation</a> + in the logback manual. In this document, we will only + cover some basic points, enough to get you started using the filtering + functionnality of the logback plugin. + </p> + + <p> + The second item of the sub-menu on the right of the logback view + opens the filter configuration window: + </p> + + <img src="images/plugin/filterWindow.gif" /> + + <p> + The upper part of the window lists the filters that are currently + used by the logback plugin. The lower part lets you create, edit + or delete a filter. + </p> + + <p> + A filter is composed of three informations. First, a Java expression, + that will be evaluated for each logging event that is recieved by + the logback plugin. This expression can use a set of common variables + such as <code>level</code>, <code>logger</code>, <code>message</code>, + and several others. For a complete list of available variables, please + refer to the <a href="manual/filters#EventEvaluator.html">chapter + about filters</a> in the logback manual. + </p> + + <p> + The second and third informations that compose a filter are the + action that will be taken when the evaluated expression is satisfied + or not. Three actions are possible: <em>ACCEPT</em>, <em>DENY</em> + or <em>NEUTRAL</em>. Setting a filter's reply to <em>ACCEPT</em> + or <em>DENY</em> will prevent the plugin from evaluating any + other filter and return a definitive result on the logging event. + </p> + + <p> + Let us create a filter that will drop any request that has a level + lower than <em>INFO</em>. A click on the <em>New</em> button creates + a new filter. Enter the following informations in the corresponding + fields: + </p> + + <ul> + <li> + Expression: <code>level &ght;= INFO</code> + </li> + <li> + Action on filter match: <code>NEUTRAL</code> + </li> + <li> + Action on filter mismatch: <code>DENY</code> + </li> + </ul> + + <p> + Here is what the window should look like, once you've + saved the filter. + </p> + + <img src="images/plugin/createFilter.gif" /> + + <p> + We've just created a filter that will drop any requests whose + level is lower than <em>INFO</em>. Note the use of the <em>NEUTRAL</em> + value as the action to be taken when the filter is matched. Since + we do not know what other filters might want to do, there is not reason + to stop evaluating when the level is higher or equal to <em>INFO</em>. + </p> + + +<script src="templates/footer.js"></script> +</div> +</body> +</html> Added: logback/trunk/logback-site/src/site/resources/images/plugin/buttons.gif ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/plugin/createFilter.gif ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/plugin/filterWindow.gif ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/plugin/prefs.gif ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/plugin/sampleLogs.gif ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/plugin/stackTrace.gif ============================================================================== Binary file. No diff available.

1 0

svn commit: r1459 - in logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse: dialog reciever
by noreply.seb＠qos.ch 26 Mar '07

26 Mar '07

Author: seb Date: Mon Mar 26 21:19:58 2007 New Revision: 1459 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java Log: Font selection now uses a combo box Better error reporting from SocketServer Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java Mon Mar 26 21:19:58 2007 @@ -1,15 +1,21 @@ package ch.qos.logback.eclipse.dialog; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; @@ -29,7 +35,7 @@ private Text patternField; private Text portField; - private Text fontField; + private Combo fontCombo; private Text fontSizeField; public LogbackPreferencesDialog(Shell parentShell, String namePattern, int serverPort, String fontName @@ -89,9 +95,18 @@ fontLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); fontLabel.setText("Select the font to use"); - fontField = new Text(container, SWT.BORDER); - fontField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); - + fontCombo = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY); + + FontData[] fdArray = Display.getDefault().getFontList(null, true); + List<String> namesList = new ArrayList<String>(); + for (int i = 0; i < fdArray.length; i++) { + String name = fdArray[i].getName(); + if (!namesList.contains(name)) { + fontCombo.add(fdArray[i].getName()); + namesList.add(name); + } + } + final Label sizeLabel = new Label(container, SWT.NONE); sizeLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); sizeLabel.setText("Enter font size"); @@ -122,12 +137,12 @@ } }); - fontField.setText(fontName); - fontField.addModifyListener(new ModifyListener() { + fontCombo.select(fontCombo.indexOf(fontName)); + fontCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - fontName = fontField.getText(); + fontName = fontCombo.getItem(fontCombo.getSelectionIndex()); } - }); + }); } protected void configureShell(Shell newShell) { Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SimpleSocketServer.java Mon Mar 26 21:19:58 2007 @@ -9,8 +9,8 @@ import ch.qos.logback.eclipse.PluginLogger; /** - * A simple {@link SocketNode} based server that recieves the logging - * events and redirects them to the LoggingEventManager + * A simple {@link SocketNode} based server that recieves the logging events and + * redirects them to the LoggingEventManager * * @author Ceki Gülcü * @author Sébastien Pennec @@ -22,19 +22,22 @@ private int port = 4321; private ServerSocket serverSocket; - + + public SimpleSocketServer() { + } + public void run() { startAndLoop(); } - + public void setPort(int port) { this.port = port; } - + public int getPort() { return port; } - + public void restart() { try { serverSocket.close(); @@ -43,7 +46,7 @@ PluginLogger.logError(e); } } - + private void startAndLoop() { try { serverSocket = new ServerSocket(port); @@ -51,28 +54,31 @@ Socket socket = serverSocket.accept(); new Thread(new SocketNode(socket)).start(); } + } catch (java.net.BindException e) { + String errorMessage = "The port " + port + " is already in use."; + PluginLogger.logError(errorMessage, e); } catch (Exception e) { PluginLogger.logError(e); } } - + public void saveState(IMemento memento) { IMemento mem = memento.createChild(TAG_SERVER); mem.putInteger(TAG_PORT, port); } - + public void init(IMemento memento) { IMemento mem = memento.getChild(TAG_SERVER); - if (mem == null) { + if (mem == null) { return; } - + int newPort = mem.getInteger(TAG_PORT); - + if (newPort != 0) { this.port = newPort; } - + } - + }

1 0