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

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 28 Mar '07

28 Mar '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Wed, 28 Mar 2007 21:00:18 +0200 Finished at: Wed, 28 Mar 2007 21:00:33 +0200 Total time: 15s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki - We now avoid polluting the output with image contents which most of the time look like gibberish anyhow. /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/Util.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 65 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [retrotranslator:translate {execution: default}] [INFO] Transforming 65 file(s) from /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.9.4-SNAPSHOT-jdk14.jar. [INFO] Transformation of 65 file(s) completed successfully. [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 22 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.db.DBAppenderTest [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7bd63e39]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7bd63e39]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) entered [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) exited [Server@12b7eea]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) entered [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) exited [Server@12b7eea]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) entered [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) exited [Server@70ba9340]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) entered [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) exited [Server@70ba9340]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.393 sec Running ch.qos.logback.access.jetty.JettyBasicTest 2007-03-28 21:00:31.384::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2007-03-28 21:00:31.463::INFO: jetty-6.1.1 2007-03-28 21:00:31.945::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 28/03/2007:21:00:32 +0200 localhost 127.0.0.1 28/03/2007:21:00:32 +0200 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.684 sec <<< FAILURE! Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.access.net.SocketAppenderTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.143 sec Results : Tests run: 29, Failures: 0, Errors: 1, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 13 seconds [INFO] Finished at: Wed Mar 28 21:00:33 CEST 2007 [INFO] Final Memory: 19M/199M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

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

28 Mar '07

Author: ceki Date: Wed Mar 28 20:41:36 2007 New Revision: 1477 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/Util.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Log: - We now avoid polluting the output with image contents which most of the time look like gibberish anyhow. 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 Wed Mar 28 20:41:36 2007 @@ -5,4 +5,9 @@ public static final String LB_OUTPUT_BUFFER = "LB_OUTPUT_BUFFER"; public final static String X_WWW_FORM_URLECODED = "application/x-www-form-urlencoded"; + + public final static String IMAGE_CONTENT_TYPE = "image/"; + public final static String IMAGE_JPEG = "image/jpeg"; + public final static String IMAGE_GIF = "image/gif"; + public final static String IMAGE_PNG = "image/png"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java Wed Mar 28 20:41:36 2007 @@ -1,6 +1,7 @@ package ch.qos.logback.access.servlet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import ch.qos.logback.access.Constants; @@ -14,4 +15,15 @@ return false; } } + + public static boolean isImageResponse(HttpServletResponse response) { + + String responseType = response.getContentType(); + + if (responseType != null && responseType.startsWith(Constants.IMAGE_CONTENT_TYPE)) { + 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 Wed Mar 28 20:41:36 2007 @@ -330,24 +330,23 @@ if (Util.isFormUrlEncoded(httpRequest)) { StringBuffer buf = new StringBuffer(); - + Enumeration pramEnumeration = httpRequest.getParameterNames(); // example: id=1234&user=cgu - // number=1233&x=1 + // number=1233&x=1 int count = 0; try { - while(pramEnumeration.hasMoreElements()) { - - - String key = (String) pramEnumeration.nextElement(); + 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) { + if (val != null) { buf.append(val); } else { buf.append(""); @@ -380,16 +379,21 @@ if (responseContent != null) { return responseContent; } - // retreive the byte array previously placed by TeeFilter - byte[] outputBuffer = (byte[]) httpRequest - .getAttribute(Constants.LB_OUTPUT_BUFFER); - if (outputBuffer != null) { - responseContent = new String(outputBuffer); - } + if (Util.isImageResponse(httpResponse)) { + responseContent = "[IMAGE CONTENTS SUPPRESSED]"; + } else { - if (responseContent == null || responseContent.length() == 0) { - responseContent = EMPTY; + // retreive the byte array previously placed by TeeFilter + byte[] outputBuffer = (byte[]) httpRequest + .getAttribute(Constants.LB_OUTPUT_BUFFER); + + if (outputBuffer != null) { + responseContent = new String(outputBuffer); + } + if (responseContent == null || responseContent.length() == 0) { + responseContent = EMPTY; + } } return responseContent;

1 0

svn commit: r1476 - logback/trunk/logback-site/src/site/pages
by noreply.seb＠qos.ch 28 Mar '07

28 Mar '07

Author: seb Date: Wed Mar 28 17:30:38 2007 New Revision: 1476 Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html Log: doc update Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/consolePlugin.html (original) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Wed Mar 28 17:30:38 2007 @@ -24,14 +24,14 @@ <h2>Logback Console Plugin for Eclipse</h2> - 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. + While developping a product, it is often useful to print logs to the console. Logging requests + may be displayed using a <code>PatternLayout</code>, and one can easily see which actions take + place when the code runs. 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 + that are not possible by using the usual output to the console. In short, here are the key advantages of the logback plugin: @@ -41,7 +41,7 @@ your logging configuration </li> <li> - View stacktraces in Eclipse's own StackTrace Console effortlessly + View stacktraces in Eclipse's StackTrace Console effortlessly </li> <li> Immediately see where a certain logging request was issued @@ -49,12 +49,16 @@ <li> Easy configuration (only one line in your logback.xml file) </li> + <li> + Change the information that is displayed about each log even after the + logs have been issued. + </li> </ul> <h3>Installation</h3> - Installing the plugin requires few steps. First get the plugin from + Installing the plugin requires a few steps. First get the plugin from our <a href="download.html">download page</a>. @@ -66,7 +70,7 @@ - Relaunching Eclipse should do the trick. To access the logback plugin, open + Relaunching Eclipse should load the plugin. To access the logback plugin, open the following menu: Window > Show view > Other... . You should see the Logback View nested in the Logback category. Selecting the view will add it to your workspace. @@ -90,7 +94,9 @@ This element will trigger the creation of a <code>SocketAppender</code> that will send events to the localhost, on port 4321 by default. That's all it takes to run your - software and log to the logback plugin. + software and log to the logback plugin. By default, logging events are not filtered, but please + keep in mind that context-wide filtering in your logging configuration may affect the events + that are recieved by the logback plugin. If you already have @@ -108,7 +114,7 @@ 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 + port to listen for events. The plugin preferences will be covered in a following section of this document. @@ -131,7 +137,8 @@ - The third button opens a sub-menu that lets you configure the logback plugin. + The third button opens a sub-menu that lets you configure the logback plugin. This + will be covered in a short moment. @@ -156,7 +163,8 @@ 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. + stacktrace. You can click on the underlined parts of the stack trace to open + an editor revealing the selected class. <img src="images/plugin/stackTrace.gif" /> @@ -260,8 +268,8 @@ 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: ACCEPT, DENY + action that will be taken depending on the result of the evaluation. + Three actions are possible: ACCEPT, DENY or NEUTRAL. Setting a filter's reply to ACCEPT or DENY will prevent the plugin from evaluating any other filter and return a definitive result on the logging event. @@ -301,6 +309,12 @@ to stop evaluating when the level is higher or equal to INFO. + + You should now be ready to experience the logback plugin and use its functionnalites. + If you have any question about its use, feel free to use the logback + <a href="mailinglist.html">mailing lists</a>. + + <script src="templates/footer.js"></script> </div>

1 0

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

28 Mar '07

Author: seb Date: Wed Mar 28 16:57:49 2007 New Revision: 1475 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java Log: Better expression control when adding/modifying filters Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java Wed Mar 28 16:57:49 2007 @@ -199,6 +199,7 @@ eval.setExpression(oldExp); eval.start(); MessageDialog.openInformation(getShell(), "Logback View", ERROR_MESSAGE_EXPRESSION); + return; } current.start(); EventFilter.add(current);

1 0

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

28 Mar '07

Author: seb Date: Wed Mar 28 15:42:38 2007 New Revision: 1474 Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html logback/trunk/logback-site/src/site/resources/images/plugin/prefs.gif logback/trunk/logback-site/src/site/resources/images/plugin/sampleLogs.gif Log: Updated plugin documentation Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/consolePlugin.html (original) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Wed Mar 28 15:42:38 2007 @@ -142,7 +142,8 @@ <img src="images/plugin/sampleLogs.gif" /> - All events with a level equal or higher to WARN are displayed in red. + All events with the WARN level are displayed in orange. ERROR + level events are displayed in red. @@ -213,6 +214,14 @@ to display the logs in the logback view. + + Finally, you can choose how many logging events should be displayed in the + view before the list is trimmed. By default, the logback plugin will display + 20'000 events. Once this number is reached, the plugin automatically drops + the 30% oldest logs. Please note that changing this value to a too much higher + value might lead to memory issues, or even crashing Eclipse. + + <h4>Filters</h4> @@ -267,7 +276,7 @@ <ul> <li> - Expression: <code>level &ght;= INFO</code> + Expression: <code>level >= INFO</code> </li> <li> Action on filter match: <code>NEUTRAL</code> Modified: logback/trunk/logback-site/src/site/resources/images/plugin/prefs.gif ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-site/src/site/resources/images/plugin/sampleLogs.gif ============================================================================== Binary files. No diff available.

1 0

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

28 Mar '07

Author: seb Date: Wed Mar 28 15:42:23 2007 New Revision: 1473 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackPreferencesDialog.java Log: Better labels 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 Wed Mar 28 15:42:23 2007 @@ -72,13 +72,9 @@ } private void createPatternUIParts(Composite container) { - final Label infoLabel = new Label(container, SWT.NONE); - infoLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); - infoLabel.setText("Enter a pattern to setup the PatternLayout:"); - final Label patternLabel = new Label(container, SWT.NONE); patternLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - patternLabel.setText("Pattern:"); + patternLabel.setText("Pattern to setup the PatternLayout:"); patternField = new Text(container, SWT.BORDER); Rectangle bounds = patternField.getBounds(); @@ -115,7 +111,7 @@ final Label sizeLabel = new Label(container, SWT.NONE); sizeLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false)); - sizeLabel.setText("Enter font size"); + sizeLabel.setText("Font size"); fontSizeField = new Text(container, SWT.BORDER); fontSizeField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); @@ -124,7 +120,7 @@ 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:"); + sizeLabel.setText("Maximum number of logs to display:"); maxSizeField = new Text(container, SWT.BORDER); maxSizeField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));

1 0

svn commit: r1472 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action
by noreply.seb＠qos.ch 28 Mar '07

28 Mar '07

Author: seb Date: Wed Mar 28 15:16:57 2007 New Revision: 1472 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConsolePluginAction.java Log: Updated ConsolePluginAction.java to set a default port Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConsolePluginAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConsolePluginAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConsolePluginAction.java Wed Mar 28 15:16:57 2007 @@ -12,22 +12,23 @@ public class ConsolePluginAction extends Action { private static final String PORT_ATTR = "port"; + private static final Integer DEFAULT_PORT = 4321; @Override public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { String portStr = attributes.getValue(PORT_ATTR); - - if (portStr == null) { - addError("The ConsolePlugin configuration requires a port attribute."); - } - Integer port = null; - try { - port = Integer.valueOf(portStr); - } catch (NumberFormatException ex) { - addError("Port " + portStr - + " in ConsolePlugin config is not a correct number"); + + if (portStr == null) { + port = DEFAULT_PORT; + } else { + try { + port = Integer.valueOf(portStr); + } catch (NumberFormatException ex) { + addError("Port " + portStr + + " in ConsolePlugin config is not a correct number"); + } } LoggerContext lc = (LoggerContext)ec.getContext();

1 0

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

28 Mar '07

Author: seb Date: Wed Mar 28 11:43:54 2007 New Revision: 1471 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Log: minor fix 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 Wed Mar 28 11:43:54 2007 @@ -223,7 +223,7 @@ private void openAndCloseClientToServer() { try { - Socket s = new Socket("localhost", server.getPort()); + new Socket("localhost", server.getPort()); } catch (Exception e) { //do nothing }

1 0

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

28 Mar '07

Author: seb Date: Wed Mar 28 11:43:27 2007 New Revision: 1470 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/SocketNode.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Log: Better management of the socket server 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 Wed Mar 28 11:43:27 2007 @@ -22,6 +22,7 @@ private int port = 4321; private ServerSocket serverSocket; + private boolean stop = false; public SimpleSocketServer() { } @@ -41,6 +42,7 @@ public void restart() { try { serverSocket.close(); + stop = false; startAndLoop(); } catch (IOException e) { PluginLogger.logError(e); @@ -48,12 +50,14 @@ } private void startAndLoop() { + stop = false; try { serverSocket = new ServerSocket(port); - while (true) { + while (!stop) { Socket socket = serverSocket.accept(); new Thread(new SocketNode(socket)).start(); } + serverSocket.close(); } catch (java.net.BindException e) { String errorMessage = "The port " + port + " is already in use."; PluginLogger.logError(errorMessage, e); @@ -80,7 +84,7 @@ } } - public boolean isPortFree() { + public static boolean isPortFree(Integer port) { try { Socket s = new Socket("localhost", port); return !s.isConnected(); @@ -88,5 +92,9 @@ return true; } } + + public void stop() { + stop = true; + } } Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SocketNode.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SocketNode.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/reciever/SocketNode.java Wed Mar 28 11:43:27 2007 @@ -23,17 +23,22 @@ Socket socket; ObjectInputStream ois; + boolean oisInError = false; public SocketNode(Socket socket) { this.socket = socket; try { ois = new ObjectInputStream(new BufferedInputStream(socket.getInputStream())); } catch (Exception e) { - + oisInError = true; } } public void run() { + if (oisInError) { + return; + } + LoggingEvent event; try { 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 Wed Mar 28 11:43:27 2007 @@ -1,5 +1,6 @@ package ch.qos.logback.eclipse.views; +import java.net.Socket; import java.net.URL; import org.eclipse.jface.action.Action; @@ -181,14 +182,6 @@ } - private void launchSocketServer(Integer port) { - server = new SimpleSocketServer(); - if (port != null) { - server.setPort(port.intValue()); - } - startServerThread(server); - } - @Override public void setFocus() { viewer.getControl().setFocus(); @@ -199,6 +192,7 @@ super.dispose(); provider.dispose(); labelProvider.dispose(); + server.stop(); } public int getServerPort() { @@ -214,8 +208,25 @@ viewer.refresh(); } - public void updateServerPort(Integer serverPort) { - launchSocketServer(serverPort); + public void updateServerPort(Integer port) { + if (port != null) { + if (SimpleSocketServer.isPortFree(port)) { + server.stop(); + openAndCloseClientToServer(); + serverThread.interrupt(); + serverThread = null; + server.setPort(port); + startServerThread(server); + } + } + } + + private void openAndCloseClientToServer() { + try { + Socket s = new Socket("localhost", server.getPort()); + } catch (Exception e) { + //do nothing + } } private void initServer() { @@ -227,7 +238,7 @@ } private void startServerThread(SimpleSocketServer server) { - if (server.isPortFree()) { + if (SimpleSocketServer.isPortFree(server.getPort())) { serverThread = new Thread(server); serverThread.start(); PluginLogger.logInfo("Now listening on port: " + server.getPort());

1 0

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

27 Mar '07

Author: ceki Date: Tue Mar 27 20:44:52 2007 New Revision: 1469 Modified: logback/trunk/pom.xml Log: cobertura and clover commented out Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Tue Mar 27 20:44:52 2007 @@ -267,26 +267,27 @@ </reportSet> </reportSets> </plugin> +    - +      - +  <plugin> <groupId>org.apache.maven.plugins</groupId>

1 0