November 2006 - logback-dev

svn commit: r1006 - in logback/trunk/logback-access: . src/main/java/ch/qos/logback/access/net src/main/java/ch/qos/logback/access/spi src/test/java/ch/qos/logback/access/net
by noreply.seb＠qos.ch 27 Nov '06

27 Nov '06

Author: seb Date: Mon Nov 27 16:38:52 2006 New Revision: 1006 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/MockSocketServer.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/NOPOutputStream.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SerializationPerfTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Log: Added some tests for SocketAppender Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Mon Nov 27 16:38:52 2006 @@ -91,6 +91,7 @@ <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/SerializationPerfTest.java</exclude> </excludes> </configuration> </plugin> Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java Mon Nov 27 16:38:52 2006 @@ -54,7 +54,7 @@ @Override protected void postProcessEvent(Object event) { AccessEvent ae = (AccessEvent)event; - ae.prepareForSerialization(); + ae.prepareForDeferredProcessing(); } } 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 Mon Nov 27 16:38:52 2006 @@ -42,6 +42,7 @@ String postContent; Map<String, Object> requestHeaderMap; + Map<String, Object> requestParameterMap; long contentLength = SENTINEL; int statusCode = SENTINEL; @@ -209,12 +210,27 @@ public void buildRequestHeaderMap() { requestHeaderMap = new HashMap<String, Object>(); Enumeration e = httpRequest.getHeaderNames(); + if (e == null) { + return; + } while (e.hasMoreElements()) { String key = (String) e.nextElement(); requestHeaderMap.put(key, httpRequest.getHeader(key)); } } - + + public void buildRequestParameterMap() { + requestParameterMap = new HashMap<String, Object>(); + Enumeration e = httpRequest.getParameterNames(); + if (e == null) { + return; + } + while (e.hasMoreElements()) { + String key = (String) e.nextElement(); + requestParameterMap.put(key, httpRequest.getParameter(key)); + } + } + public String getResponseHeader(String key) { return serverAdapter.getResponseHeader(key); } @@ -319,7 +335,20 @@ return serverAdapter; } - public void prepareForSerialization() { + public void prepareForDeferredProcessing() { + buildRequestHeaderMap(); + buildRequestParameterMap(); + getLocalPort(); + getMethod(); + getProtocol(); + getRemoteAddr(); + getRemoteHost(); + getRemoteUser(); + getRequestURI(); + getRequestURL(); + getServerName(); + getTimeStamp(); + getStatusCode(); getContentLength(); //getPostContent(); Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/MockSocketServer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/MockSocketServer.java Mon Nov 27 16:38:52 2006 @@ -0,0 +1,73 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.access.net; + +import java.io.BufferedInputStream; +import java.io.ObjectInputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.ArrayList; +import java.util.List; + +import ch.qos.logback.access.spi.AccessEvent; + + +/** + * @author Sébastien Pennec + */ +public class MockSocketServer extends Thread { + + static final int PORT = 4560; + + final int loopLen; + + List<AccessEvent> accessEventList = new ArrayList<AccessEvent>(); + boolean finished = false; + + MockSocketServer(int loopLen) { + super(); + this.loopLen = loopLen; + } + + @Override + public void run() { + ObjectInputStream ois = null; + ServerSocket serverSocket = null; + // Object readObject; + AccessEvent event; + try { + serverSocket = new ServerSocket(PORT); + Socket socket = serverSocket.accept(); + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); + for (int i = 0; i < loopLen; i++) { + event = (AccessEvent) ois.readObject(); + accessEventList.add(event); + } + } catch (Exception se) { + se.printStackTrace(); + } finally { + + if (ois != null) { + try { + ois.close(); + } catch (Exception e) { + } + } + if (serverSocket != null) { + try { + serverSocket.close(); + } catch (Exception e) { + } + } + } + finished = true; + } +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/NOPOutputStream.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/NOPOutputStream.java Mon Nov 27 16:38:52 2006 @@ -0,0 +1,24 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.access.net; + +import java.io.IOException; +import java.io.OutputStream; + +public class NOPOutputStream extends OutputStream { + + @Override + public void write(int b) throws IOException { + // do nothing + + } + +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SerializationPerfTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SerializationPerfTest.java Mon Nov 27 16:38:52 2006 @@ -0,0 +1,96 @@ +package ch.qos.logback.access.net; + +import java.io.IOException; +import java.io.ObjectOutputStream; + +import junit.framework.TestCase; +import ch.qos.logback.access.pattern.helpers.DummyRequest; +import ch.qos.logback.access.pattern.helpers.DummyResponse; +import ch.qos.logback.access.pattern.helpers.DummyServerAdapter; +import ch.qos.logback.access.spi.AccessEvent; + +public class SerializationPerfTest extends TestCase { + + ObjectOutputStream oos; + + int loopNumber = 10000; + int resetFrequency = 100; + int pauseFrequency = 10; + long pauseLengthInMillis = 20; + + + public void setUp() throws Exception { + super.setUp(); + oos = new ObjectOutputStream(new NOPOutputStream()); + + } + + public void tearDown() throws Exception { + super.tearDown(); + oos.close(); + oos = null; + } + + public void test1() throws Exception { + // first run for just in time compiler + int resetCounter = 0; + int pauseCounter = 0; + for (int i = 0; i < loopNumber; i++) { + try { + oos.writeObject(buildNewAccessEvent()); + oos.flush(); + if (++resetCounter >= resetFrequency) { + oos.reset(); + resetCounter = 0; + } + if (++pauseCounter >= pauseFrequency) { + Thread.sleep(pauseLengthInMillis); + pauseCounter = 0; + } + + } catch (IOException ex) { + fail(ex.getMessage()); + } + } + + // second run + Long t1; + Long t2; + Long total = 0L; + resetCounter = 0; + pauseCounter = 0; + // System.out.println("Beginning mesured run"); + for (int i = 0; i < loopNumber; i++) { + try { + t1 = System.nanoTime(); + oos.writeObject(buildNewAccessEvent()); + oos.flush(); + t2 = System.nanoTime(); + total += (t2 - t1); + if (++resetCounter >= resetFrequency) { + oos.reset(); + resetCounter = 0; + } + if (++pauseCounter >= pauseFrequency) { + Thread.sleep(pauseLengthInMillis); + pauseCounter = 0; + } + } catch (IOException ex) { + fail(ex.getMessage()); + } + } + total /= 1000; + System.out.println("Loop done : average time = " + total / loopNumber + + " microsecs after " + loopNumber + " writes."); + } + + private AccessEvent buildNewAccessEvent() { + DummyRequest request = new DummyRequest(); + DummyResponse response = new DummyResponse(); + DummyServerAdapter adapter = new DummyServerAdapter(request, response); + + AccessEvent ae = new AccessEvent(request, response, adapter); + return ae; + } + +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java Mon Nov 27 16:38:52 2006 @@ -0,0 +1,77 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.access.net; + +import junit.framework.TestCase; +import ch.qos.logback.access.pattern.helpers.DummyRequest; +import ch.qos.logback.access.pattern.helpers.DummyResponse; +import ch.qos.logback.access.pattern.helpers.DummyServerAdapter; +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.access.spi.BasicContext; + + +public class SocketAppenderTest extends TestCase { + + private BasicContext context; + private MockSocketServer mockSocketServer; + + public void testStartFailNoRemoteHost() { + context = new BasicContext(); + SocketAppender appender = new SocketAppender(); + appender.setContext(context); + appender.setPort(123); + appender.start(); + assertEquals(1, context.getStatusManager().getCount()); + } + + public void testRecieveMessage() throws InterruptedException { + startServer(1); + configureClient(); + + context.callAppenders(buildNewAccessEvent()); + // Wait max 2 seconds for mock server to finish. However, it should + // finish much sooner than that. + mockSocketServer.join(2000); + assertTrue(mockSocketServer.finished); + assertEquals(1, mockSocketServer.accessEventList.size()); + + AccessEvent remoteEvent = mockSocketServer.accessEventList.get(0); + assertEquals("headerValue1", remoteEvent.getRequestHeader("headerName1")); + assertEquals("testHost", remoteEvent.getRemoteHost()); + } + + private void startServer(int expectedEventNumber) throws InterruptedException { + mockSocketServer = new MockSocketServer(expectedEventNumber); + mockSocketServer.start(); + // give MockSocketServer head start + Thread.sleep(100); + } + + private void configureClient() { + context = new BasicContext(); + context.setName("test"); + SocketAppender socketAppender = new SocketAppender(); + socketAppender.setContext(context); + socketAppender.setName("socket"); + socketAppender.setPort(MockSocketServer.PORT); + socketAppender.setRemoteHost("localhost"); + context.addAppender(socketAppender); + socketAppender.start(); + } + + private AccessEvent buildNewAccessEvent() { + DummyRequest request = new DummyRequest(); + DummyResponse response = new DummyResponse(); + DummyServerAdapter adapter = new DummyServerAdapter(request, response); + + AccessEvent ae = new AccessEvent(request, response, adapter); + return ae; + } +}

1 0

[continuum] BUILD SUCCESSFUL: Logback Access Module
by John Noreplai 27 Nov '06

27 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Mon, 27 Nov 2006 15:22:37 +0100 Finished at: Mon, 27 Nov 2006 15:22:50 +0100 Total time: 13s Build Trigger: Forced Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes No files changed **************************************************************************** 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 55 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 15 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.jetty.JettyBasicTest 2006-11-27 15:22:48.326::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2006-11-27 15:22:48.382::INFO: jetty-6.0.x |-WARN in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - filename property not set. Assuming [null/etc/logback-access.xml] |-ERROR in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - [null/etc/logback-access.xml] does not exist |-INFO in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - RequestLog added to RequestLogRegistry with name: LogbackRequestLog 2006-11-27 15:22:48.445::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 27/11/2006:15:22:48 +0100 localhost 127.0.0.1 27/11/2006:15:22:48 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.27 sec Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Results : Tests run: 23, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-access/0.6-SNAPSHOT/logback-access-0.6-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 11 seconds [INFO] Finished at: Mon Nov 27 15:22:50 CET 2006 [INFO] Final Memory: 12M/143M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 27 Nov '06

27 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Mon, 27 Nov 2006 15:20:17 +0100 Finished at: Mon, 27 Nov 2006 15:20:31 +0100 Total time: 14s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes seb Working version of access's SocketAppender and SimpleSocketServer Work in progress /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java /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/BasicContext.java /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketServer.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 55 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 15 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.jetty.JettyBasicTest 2006-11-27 15:20:29.642::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2006-11-27 15:20:29.783::INFO: jetty-6.0.x |-WARN in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - filename property not set. Assuming [null/etc/logback-access.xml] |-ERROR in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - [null/etc/logback-access.xml] does not exist |-INFO in ch.qos.logback.access.jetty.RequestLogImpl@624b035d - RequestLog added to RequestLogRegistry with name: LogbackRequestLog 2006-11-27 15:20:29.848::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 27/11/2006:15:20:29 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.525 sec <<< FAILURE! Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 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.012 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec Results : Tests run: 23, 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: 12 seconds [INFO] Finished at: Mon Nov 27 15:20:31 CET 2006 [INFO] Final Memory: 12M/142M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r1005 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/jetty logback-access/src/main/java/ch/qos/logback/access/net logback-access/src/main/java/ch/qos/logback/access/spi logback-classic/src/main/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 27 Nov '06

27 Nov '06

Author: seb Date: Mon Nov 27 15:18:03 2006 New Revision: 1005 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketServer.java Log: Working version of access's SocketAppender and SimpleSocketServer Work in progress Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Mon Nov 27 15:18:03 2006 @@ -164,7 +164,7 @@ } RequestLogRegistry.register(this); getStatusManager().add( - new InfoStatus("RequestLog added to RequestLogMapper with name: " + new InfoStatus("RequestLog added to RequestLogRegistry with name: " + getName(), this)); } catch (JoranException e) { Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java Mon Nov 27 15:18:03 2006 @@ -0,0 +1,97 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.access.net; + +import java.net.ServerSocket; +import java.net.Socket; + +import ch.qos.logback.access.joran.JoranConfigurator; +import ch.qos.logback.access.spi.BasicContext; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +/** + * A simple {@link SocketNode} based server. + * + * <pre> + * Usage: java ch.qos.logback.access.net.SimpleSocketServer port configFile + * + * where + * + * port + * + * is a part number where the server listens and + * + * configFile + * + * is an xml configuration file fed to {@link JoranConfigurator}. + * </pre> + * + * @author Ceki Gülcü + * @author Sébastien Pennec + * + * @since 0.8.4 + */ +public class SimpleSocketServer { + + static int port; + + private static BasicContext basicContext; + + public static void main(String argv[]) throws Exception { + if (argv.length == 2) { + init(argv[0], argv[1]); + } else { + usage("Wrong number of arguments."); + } + + runServer(); + } + + static void runServer() { + try { + System.out.println("Listening on port " + port); + ServerSocket serverSocket = new ServerSocket(port); + while (true) { + System.out.println("Waiting to accept a new client."); + Socket socket = serverSocket.accept(); + System.out.println("Connected to client at " + socket.getInetAddress()); + System.out.println("Starting new socket node."); + new Thread(new SocketNode(socket, basicContext)).start(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + static void usage(String msg) { + System.err.println(msg); + System.err.println("Usage: java " + SimpleSocketServer.class.getName() + + " port configFile"); + System.exit(1); + } + + static void init(String portStr, String configFile) throws JoranException { + try { + port = Integer.parseInt(portStr); + } catch (java.lang.NumberFormatException e) { + e.printStackTrace(); + usage("Could not interpret port number [" + portStr + "]."); + } + + basicContext = new BasicContext(); + if (configFile.endsWith(".xml")) { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(basicContext); + configurator.doConfigure(configFile); + StatusPrinter.print(basicContext); + } + } +} Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java Mon Nov 27 15:18:03 2006 @@ -13,6 +13,7 @@ import java.net.InetAddress; +import ch.qos.logback.access.spi.AccessEvent; import ch.qos.logback.core.net.SocketAppenderBase; /** @@ -52,6 +53,8 @@ @Override protected void postProcessEvent(Object event) { + AccessEvent ae = (AccessEvent)event; + ae.prepareForSerialization(); } } Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java Mon Nov 27 15:18:03 2006 @@ -0,0 +1,86 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.access.net; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.net.Socket; + +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.access.spi.BasicContext; +import ch.qos.logback.core.spi.FilterReply; + +// Contributors: Moses Hohman <mmhohman(a)rainbow.uchicago.edu> + +/** + * Read {@link AccessEvent} objects sent from a remote client using Sockets + * (TCP). These logging events are logged according to local policy, as if they + * were generated locally. + * + * + * For example, the socket node might decide to log events to a local file and + * also resent them to a second socket node. + * + * @author Ceki Gülcü + * @author Sébastien Pennec + * + * @since 0.8.4 + */ +public class SocketNode implements Runnable { + + Socket socket; + BasicContext context; + ObjectInputStream ois; + + public SocketNode(Socket socket, BasicContext context) { + this.socket = socket; + this.context = context; + try { + ois = new ObjectInputStream(new BufferedInputStream(socket + .getInputStream())); + } catch (Exception e) { + System.out.println("Could not open ObjectInputStream to " + socket + e); + } + } + + public void run() { + AccessEvent event; + + try { + while (true) { + // read an event from the wire + event = (AccessEvent) ois.readObject(); + //check that the event should be logged + if (context.getFilterChainDecision(event) == FilterReply.DENY) { + break; + } + //send it to the appenders + context.callAppenders(event); + } + } catch (java.io.EOFException e) { + System.out.println("Caught java.io.EOFException closing connection."); + } catch (java.net.SocketException e) { + System.out.println("Caught java.net.SocketException closing connection."); + } catch (IOException e) { + System.out.println("Caught java.io.IOException: " + e); + System.out.println("Closing connection."); + } catch (Exception e) { + System.out.println("Unexpected exception. Closing connection." + e); + } + + try { + ois.close(); + } catch (Exception e) { + System.out.println("Could not close connection." + e); + } + } +} 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 Mon Nov 27 15:18:03 2006 @@ -1,6 +1,5 @@ package ch.qos.logback.access.spi; -import java.io.InputStream; import java.io.Serializable; import java.util.Enumeration; import java.util.HashMap; @@ -48,7 +47,7 @@ int statusCode = SENTINEL; int localPort = SENTINEL; - ServerAdapter serverAdapter; + transient ServerAdapter serverAdapter; /** * The number of milliseconds elapsed from 1/1/1970 until logging event was @@ -293,12 +292,12 @@ return postContent; } - try { - InputStream in = httpRequest.getInputStream(); - postContent = Util.readToString(in); - } catch (Exception ex) { - // do nothing - } +// try { +// InputStream in = httpRequest.getInputStream(); +// postContent = Util.readToString(in); +// } catch (Exception ex) { +// // do nothing +// } if (postContent == null || postContent.length() == 0) { postContent = NA; } @@ -319,4 +318,10 @@ public ServerAdapter getServerAdapter() { return serverAdapter; } + + public void prepareForSerialization() { + getStatusCode(); + getContentLength(); + //getPostContent(); + } } \ No newline at end of file Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java Mon Nov 27 15:18:03 2006 @@ -0,0 +1,73 @@ +package ch.qos.logback.access.spi; + +import java.util.Iterator; + +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.filter.Filter; +import ch.qos.logback.core.spi.AppenderAttachable; +import ch.qos.logback.core.spi.AppenderAttachableImpl; +import ch.qos.logback.core.spi.FilterAttachable; +import ch.qos.logback.core.spi.FilterAttachableImpl; +import ch.qos.logback.core.spi.FilterReply; + +/** + * This class is a context that can be used + * by access to provide the basic functionnalities of a context + * to its components, mainly SocketServer. + * + * @author Sébastien Pennec + */ +public class BasicContext extends ContextBase implements AppenderAttachable, FilterAttachable { + + AppenderAttachableImpl aai = new AppenderAttachableImpl(); + FilterAttachableImpl fai = new FilterAttachableImpl(); + + public void callAppenders(AccessEvent event) { + aai.appendLoopOnAppenders(event); + } + + public void addAppender(Appender newAppender) { + aai.addAppender(newAppender); + } + + public void detachAndStopAllAppenders() { + aai.detachAndStopAllAppenders(); + } + + public boolean detachAppender(Appender appender) { + return aai.detachAppender(appender); + } + + public Appender detachAppender(String name) { + return aai.detachAppender(name); + } + + public Appender getAppender(String name) { + return aai.getAppender(name); + } + + public boolean isAttached(Appender appender) { + return aai.isAttached(appender); + } + + public Iterator iteratorForAppenders() { + return aai.iteratorForAppenders(); + } + + public void addFilter(Filter newFilter) { + fai.addFilter(newFilter); + } + + public void clearAllFilters() { + fai.clearAllFilters(); + } + + public FilterReply getFilterChainDecision(Object event) { + return fai.getFilterChainDecision(event); + } + + public Filter getFirstFilter() { + return fai.getFirstFilter(); + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketServer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketServer.java Mon Nov 27 15:18:03 2006 @@ -29,16 +29,16 @@ * client. * * <pre> - * Usage: java ch.qos.logback.classic.net.SocketServer port configFile configDir + * Usage: java ch.qos.logback.classic.net.SocketServer port configFile configDir * - * where port is a part number where the server listens, - * configFile is an xml configuration file fed to the {@link JoranConfigurator} and - * configDir is a path to a directory containing configuration files, possibly one for each client host. + * where port is a part number where the server listens, + * configFile is an xml configuration file fed to the {@link JoranConfigurator} and + * configDir is a path to a directory containing configuration files, possibly one for each client host. * </pre> * * - * The <code>configFile</code> is used to configure the log4j default - * hierarchy that the <code>SocketServer</code> will use to report on its + * The <code>configFile</code> is used to configure the logback default + * context that the <code>SocketServer</code> will use to report on its * actions. * *

1 0

svn commit: r1004 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 25 Nov '06

25 Nov '06

Author: ceki Date: Sat Nov 25 14:50:17 2006 New Revision: 1004 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Log: - don't crash the server in case JoranConfiguration throws an exception Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Sat Nov 25 14:50:17 2006 @@ -22,7 +22,6 @@ import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; -import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.StatusPrinter; @@ -37,11 +36,11 @@ * be added to the jetty configuration file, namely etc/jetty.xml: * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> - * </Set> - * </Ref> + * <Ref id="requestLog"> + * <Set name="requestLog"> + * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> + * </Set> + * </Ref> * </pre> * * By default, RequestLogImpl looks for a logback configuration file called @@ -56,45 +55,45 @@ * logback-access.xml file. * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> - * <Set name="fileName">path/to/logback.xml</Set> - * </Set> - * </Ref> + * <Ref id="requestLog"> + * <Set name="requestLog"> + * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> + * <Set name="fileName">path/to/logback.xml</Set> + * </Set> + * </Ref> * </pre> * * * Here is a sample logback-access.xml file that can be used right away: * * <pre> - * <configuration> - * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> - * </configuration> + * <configuration> + * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> + * </layout> + * </appender> + * + * <appender-ref ref="STDOUT" /> + * </configuration> * </pre> * * * Another configuration file, using SMTPAppender, could be: * * <pre> - * <configuration> - * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="pattern" value="%remoteIP [%date] %requestURL %statusCode %bytesSent" /> - * </layout> - * <param name="From" value="sender(a)domaine.org" /> - * <param name="SMTPHost" value="mail.domain.org" /> - * <param name="Subject" value="Last Event: %statusCode %requestURL" /> - * <param name="To" value="server_admin(a)domain.org" /> - * </appender> - * <appender-ref ref="SMTP" /> - * </configuration> + * <configuration> + * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="pattern" value="%remoteIP [%date] %requestURL %statusCode %bytesSent" /> + * </layout> + * <param name="From" value="sender(a)domaine.org" /> + * <param name="SMTPHost" value="mail.domain.org" /> + * <param name="Subject" value="Last Event: %statusCode %requestURL" /> + * <param name="To" value="server_admin(a)domain.org" /> + * </appender> + * <appender-ref ref="SMTP" /> + * </configuration> * </pre> * * @@ -129,7 +128,7 @@ jettyResponse); AccessEvent accessEvent = new AccessEvent(jettyRequest, jettyResponse, adapter); - + if (getFilterChainDecision(accessEvent) == FilterReply.DENY) { return; } @@ -137,7 +136,7 @@ aai.appendLoopOnAppenders(accessEvent); } - public void start() { + public void start() { if (filename == null) { String jettyHomeProperty = System.getProperty("jetty.home"); @@ -148,31 +147,31 @@ + "]", this)); } - File configFile = new File(filename); - if (configFile.exists()) { - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(this); - try { + try { + File configFile = new File(filename); + if (configFile.exists()) { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(this); jc.doConfigure(filename); - } catch (JoranException e) { - e.printStackTrace(System.out); + + } else { + getStatusManager().add( + new ErrorStatus("[" + filename + "] does not exist", this)); + } + + if (getName() == null) { + setName("LogbackRequestLog"); } - - } else { + RequestLogRegistry.register(this); getStatusManager().add( - new ErrorStatus("[" + filename + "] does not exist", this)); - } - - if (getName() == null) { - setName("LogbackRequestLog"); - } - RequestLogRegistry.register(this); - getStatusManager().add( - new InfoStatus("RequestLog added to RequestLogMapper with name: " + getName(), this)); + new InfoStatus("RequestLog added to RequestLogMapper with name: " + + getName(), this)); - if(getStatusManager().getLevel() != Status.INFO) { - StatusPrinter.print(getStatusManager()); + } catch (JoranException e) { + // errors have been registered as status messages } + + StatusPrinter.print(getStatusManager()); } public void stop() throws Exception {

1 0

svn commit: r1003 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event
by noreply.ceki＠qos.ch 25 Nov '06

25 Nov '06

Author: ceki Date: Sat Nov 25 14:47:50 2006 New Revision: 1003 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java Log: Reduce the amount of noise when reporting errors Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java Sat Nov 25 14:47:50 2006 @@ -148,20 +148,17 @@ } public void error(SAXParseException spe) throws SAXException { - addError("Parsing error", spe); - addError("Parsing problem on line " + spe.getLineNumber() + " and column " + addError("Parsing error on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe); } public void fatalError(SAXParseException spe) throws SAXException { - addError("Parsing fatal error", spe); - addError("Parsing problem on line " + spe.getLineNumber() + " and column " + addError("Parsing fatal error on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe); } public void warning(SAXParseException spe) throws SAXException { - addWarn("Parsing warning", spe); - addWarn("Parsing problem on line " + spe.getLineNumber() + " and column " + addWarn("Parsing warning on line " + spe.getLineNumber() + " and column " + spe.getColumnNumber(), spe); }

1 0

svn commit: r1002 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 25 Nov '06

25 Nov '06

Author: ceki Date: Sat Nov 25 14:20:21 2006 New Revision: 1002 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java - copied, changed from r1001, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java Removed: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Log: - Print stack trace in case of parsing problems of the joran config file - RequestLogRegistry instead of RequestLogMapper - print Status list only in case of errors or warnings Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Sat Nov 25 14:20:21 2006 @@ -14,6 +14,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.filter.Filter; +import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; import ch.qos.logback.core.spi.FilterAttachable; @@ -21,6 +22,7 @@ import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.StatusPrinter; @@ -135,7 +137,8 @@ aai.appendLoopOnAppenders(accessEvent); } - public void start() throws Exception { + public void start() { + if (filename == null) { String jettyHomeProperty = System.getProperty("jetty.home"); @@ -149,8 +152,12 @@ if (configFile.exists()) { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(this); - jc.doConfigure(filename); - StatusPrinter.print(getStatusManager()); + try { + jc.doConfigure(filename); + } catch (JoranException e) { + e.printStackTrace(System.out); + } + } else { getStatusManager().add( new ErrorStatus("[" + filename + "] does not exist", this)); @@ -159,9 +166,13 @@ if (getName() == null) { setName("LogbackRequestLog"); } - RequestLogMapper.addRequestLog(this); + RequestLogRegistry.register(this); getStatusManager().add( new InfoStatus("RequestLog added to RequestLogMapper with name: " + getName(), this)); + + if(getStatusManager().getLevel() != Status.INFO) { + StatusPrinter.print(getStatusManager()); + } } public void stop() throws Exception { Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java (from r1001, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java) ============================================================================== --- /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogMapper.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java Sat Nov 25 14:20:21 2006 @@ -3,16 +3,16 @@ import java.util.HashMap; import java.util.Map; -public class RequestLogMapper { +public class RequestLogRegistry { - private static Map<String, RequestLogImpl> requestLogMap = new HashMap<String, RequestLogImpl>(); + private static Map<String, RequestLogImpl> requestLogRegistry = new HashMap<String, RequestLogImpl>(); - public static void addRequestLog(RequestLogImpl requestLogImpl) { - requestLogMap.put(requestLogImpl.getName(), requestLogImpl); + public static void register(RequestLogImpl requestLogImpl) { + requestLogRegistry.put(requestLogImpl.getName(), requestLogImpl); } public static RequestLogImpl get(String key) { - return requestLogMap.get(key); + return requestLogRegistry.get(key); } }

1 0

svn commit: r1001 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/net logback-access/src/main/java/ch/qos/logback/access/spi logback-classic/src/main/java/ch/qos/logback/classic/net logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core/net
by noreply.seb＠qos.ch 24 Nov '06

24 Nov '06

Author: seb Date: Fri Nov 24 18:00:58 2006 New Revision: 1001 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Log: Added an access specific implementation of SocketAppender. Moved to core module the common functionnalities Minor modifications on the other classes (format,...) Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java Fri Nov 24 18:00:58 2006 @@ -18,21 +18,11 @@ import ch.qos.logback.core.net.SMTPAppenderBase; /** - * Send an e-mail when a specific access event occurs, typically on server errors. + * Send an e-mail when a specific access event occurs, typically when + * certain pages are accessed. * - * - * The number of access events delivered in this e-mail depend on the value of - * BufferSize option. The <code>SMTPAppender</code> keeps only the - * last <code>BufferSize</code> access events in its cyclic buffer. This - * keeps memory requirements at a reasonable level while still delivering useful - * application context. - * - * By default, the email is sent everytime an event has a status code of - * 500 (server error) or higher. In order not to flood one's mailbox, - * an email will be sent only if the previous email was sent more that 24 hours ago. - * - * This behaviour can be easily bypassed either by modifying this class, or by - * imlementing a new <code>EventEvaluator</code>. + * For more informations about this appender, please refer to the online manual at + * http://logback.qos.ch/manual/appenders.html#AccessSMTPAppender * * @author Ceki Gülcü * @author Sébastien Pennec Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java Fri Nov 24 18:00:58 2006 @@ -0,0 +1,57 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +// Contributors: Dan MacDonald <dan(a)redknee.com> +package ch.qos.logback.access.net; + +import java.net.InetAddress; + +import ch.qos.logback.core.net.SocketAppenderBase; + +/** + * Sends {@link AccessEvent} objects to a remote a log server, usually a + * {@link SocketNode}. + * + * For more informations about this appender, please refer to the online manual at + * http://logback.qos.ch/manual/appenders.html#AccessSocketAppender + * + * @author Ceki Gülcü + * @author Sébastien Pennec + * + */ + +public class SocketAppender extends SocketAppenderBase { + + public SocketAppender() { + } + + /** + * Connects to remote server at <code>address</code> and <code>port</code>. + */ + public SocketAppender(InetAddress address, int port) { + this.address = address; + this.remoteHost = address.getHostName(); + this.port = port; + } + + /** + * Connects to remote server at <code>host</code> and <code>port</code>. + */ + public SocketAppender(String host, int port) { + this.port = port; + this.address = getAddressByName(host); + this.remoteHost = host; + } + + @Override + protected void postProcessEvent(Object event) { + } + +} 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 Fri Nov 24 18:00:58 2006 @@ -14,7 +14,8 @@ /** * The Access module's internal representation of logging events. When the - * RequestLogImpl instance is called to log then a <code>AccessEvent</code> + * logging component instance is called in the container to log then a + * <code>AccessEvent</code> * instance is created. This instance is passed around to the different logback * components. * Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Fri Nov 24 18:00:58 2006 @@ -11,14 +11,10 @@ // Contributors: Dan MacDonald <dan(a)redknee.com> package ch.qos.logback.classic.net; -import java.io.IOException; -import java.io.ObjectOutputStream; import java.net.InetAddress; -import java.net.Socket; import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; +import ch.qos.logback.core.net.SocketAppenderBase; /** * Sends {@link LoggingEvent} objects to a remote a log server, usually a @@ -29,41 +25,12 @@ * * @author Ceki Gülcü * @author Sébastien Pennec - * - * @since 0.8.4 */ -public class SocketAppender extends AppenderBase { - - /** - * The default port number of remote logging server (4560). - */ - static final int DEFAULT_PORT = 4560; +public class SocketAppender extends SocketAppenderBase { - /** - * The default reconnection delay (30000 milliseconds or 30 seconds). - */ - static final int DEFAULT_RECONNECTION_DELAY = 30000; - - /** - * We remember host name as String in addition to the resolved InetAddress so - * that it can be returned via getOption(). - */ - String remoteHost; - - InetAddress address; - int port = DEFAULT_PORT; - ObjectOutputStream oos; - int reconnectionDelay = DEFAULT_RECONNECTION_DELAY; boolean includeCallerData = false; - - private Connector connector; - - int counter = 0; - - // reset the ObjectOutputStream every 70 calls - private static final int RESET_FREQUENCY = 70; - + public SocketAppender() { } @@ -74,7 +41,6 @@ this.address = address; this.remoteHost = address.getHostName(); this.port = port; - // connect(address, port); } /** @@ -84,259 +50,17 @@ this.port = port; this.address = getAddressByName(host); this.remoteHost = host; - // connect(address, port); } - - // /** - // * Connect to the specified RemoteHost and Port. - // */ - // public void activateOptions() { - // connect(address, port); - // } - - /** - * Start this appender. - */ - public void start() { - int errorCount = 0; - if (port == 0) { - errorCount++; - addError("No port was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_port"); - } - - if (address == null) { - errorCount++; - addError("No remote address was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); - } - - connect(address, port); - - if (errorCount == 0) { - this.started = true; - } - } - - /** - * Strop this appender. - * - * - * This will mark the appender as closed and call then {@link #cleanUp} - * method. - */ - @Override - public void stop() { - if (!isStarted()) - return; - - this.started = false; - cleanUp(); - } - - /** - * Drop the connection to the remote host and release the underlying connector - * thread if it has been created - */ - public void cleanUp() { - if (oos != null) { - try { - oos.close(); - } catch (IOException e) { - addError("Could not close oos.", e); - } - oos = null; - } - if (connector != null) { - addInfo("Interrupting the connector."); - connector.interrupted = true; - connector = null; // allow gc - } - } - - void connect(InetAddress address, int port) { - if (this.address == null) - return; - try { - // First, close the previous connection if any. - cleanUp(); - oos = new ObjectOutputStream(new Socket(address, port).getOutputStream()); - } catch (IOException e) { - - String msg = "Could not connect to remote logback server at [" - + address.getHostName() + "]."; - if (reconnectionDelay > 0) { - msg += " We will try again later."; - fireConnector(); // fire the connector thread - } - addError(msg, e); - } - } - + @Override - protected void append(Object event) { - - if (event == null) - return; - - if (address == null) { - addError("No remote host is set for SocketAppender named \"" + this.name - + "\". For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); - return; - } - - if (oos != null) { - try { - if (includeCallerData) { - ((LoggingEvent)event).getCallerData(); - } - oos.writeObject(event); - // addInfo("=========Flushing."); - oos.flush(); - if (++counter >= RESET_FREQUENCY) { - counter = 0; - // Failing to reset the object output stream every now and - // then creates a serious memory leak. - // System.err.println("Doing oos.reset()"); - oos.reset(); - } - } catch (IOException e) { - oos = null; - addWarn("Detected problem with connection: " + e); - if (reconnectionDelay > 0) { - fireConnector(); - } - } - } - } - - void fireConnector() { - if (connector == null) { - addInfo("Starting a new connector thread."); - connector = new Connector(); - connector.setDaemon(true); - connector.setPriority(Thread.MIN_PRIORITY); - connector.start(); - } - } - - static InetAddress getAddressByName(String host) { - try { - return InetAddress.getByName(host); - } catch (Exception e) { - // addError("Could not find address of [" + host + "].", e); - return null; - } - } - - /** - * The RemoteHost option takes a string value which should be the host - * name of the server where a {@link SocketNode} is running. - */ - public void setRemoteHost(String host) { - address = getAddressByName(host); - remoteHost = host; - } - - /** - * Returns value of the RemoteHost option. - */ - public String getRemoteHost() { - return remoteHost; - } - - /** - * The Port option takes a positive integer representing the port - * where the server is waiting for connections. - */ - public void setPort(int port) { - this.port = port; - } - - /** - * Returns value of the Port option. - */ - public int getPort() { - return port; + protected void postProcessEvent(Object event) { + if (includeCallerData) { + ((LoggingEvent) event).getCallerData(); + } } public void setIncludeCallerData(boolean includeCallerData) { this.includeCallerData = includeCallerData; } - - - /** - * The ReconnectionDelay option takes a positive integer representing - * the number of milliseconds to wait between each failed connection attempt - * to the server. The default value of this option is 30000 which corresponds - * to 30 seconds. - * - * - * Setting this option to zero turns off reconnection capability. - */ - public void setReconnectionDelay(int delay) { - this.reconnectionDelay = delay; - } - - /** - * Returns value of the ReconnectionDelay option. - */ - public int getReconnectionDelay() { - return reconnectionDelay; - } - - public Layout getLayout() { - return null; - } - - public void setLayout(Layout layout) { - } - - /** - * The Connector will reconnect when the server becomes available again. It - * does this by attempting to open a new connection every - * <code>reconnectionDelay</code> milliseconds. - * - * - * It stops trying whenever a connection is established. It will restart to - * try reconnect to the server when previpously open connection is droppped. - * - * @author Ceki Gülcü - * @since 0.8.4 - */ - class Connector extends Thread { - - boolean interrupted = false; - - public void run() { - Socket socket; - while (!interrupted) { - try { - sleep(reconnectionDelay); - addInfo("Attempting connection to " + address.getHostName()); - socket = new Socket(address, port); - synchronized (this) { - oos = new ObjectOutputStream(socket.getOutputStream()); - connector = null; - addInfo("Connection established. Exiting connector thread."); - break; - } - } catch (InterruptedException e) { - addInfo("Connector interrupted. Leaving loop."); - return; - } catch (java.net.ConnectException e) { - addInfo("Remote host " + address.getHostName() - + " refused connection."); - } catch (IOException e) { - addInfo("Could not connect to " + address.getHostName() - + ". Exception is " + e); - } - } - // addInfo("Exiting Connector.run() method."); - } - - /** - * public void finalize() { LogLog.debug("Connector finalize() has been - * called."); } - */ - } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Fri Nov 24 18:00:58 2006 @@ -6,25 +6,25 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.util.StatusPrinter; - public class SocketAppenderTestApp { - public static void main(String[] args) { + public static void main(String[] args) { - Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - SocketAppender appender = new SocketAppender("localhost", 4560); - appender.setContext(lc); - appender.setName("socket"); - appender.start(); + Logger logger = (Logger) LoggerFactory + .getLogger(SocketAppenderTestApp.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SocketAppender appender = new SocketAppender("localhost", 4560); + appender.setContext(lc); + appender.setName("socket"); + appender.start(); - logger.addAppender(appender); + logger.addAppender(appender); - for (int i = 0; i <= 1000; i++) { - logger.debug("** Hello world. n=" + i); - } + for (int i = 0; i <= 1000; i++) { + logger.debug("** Hello world. n=" + i); + } - StatusPrinter.print(lc.getStatusManager()); + StatusPrinter.print(lc.getStatusManager()); - } + } } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java Fri Nov 24 18:00:58 2006 @@ -0,0 +1,310 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +// Contributors: Dan MacDonald <dan(a)redknee.com> +package ch.qos.logback.core.net; + +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.net.InetAddress; +import java.net.Socket; + +import ch.qos.logback.core.AppenderBase; +import ch.qos.logback.core.Layout; + +/** + * + * This is the base class for module specific SocketAppender + * implementations. + * + * @author Ceki Gülcü + * @author Sébastien Pennec + */ + +public abstract class SocketAppenderBase extends AppenderBase { + + /** + * The default port number of remote logging server (4560). + */ + static final int DEFAULT_PORT = 4560; + + /** + * The default reconnection delay (30000 milliseconds or 30 seconds). + */ + static final int DEFAULT_RECONNECTION_DELAY = 30000; + + /** + * We remember host name as String in addition to the resolved InetAddress so + * that it can be returned via getOption(). + */ + protected String remoteHost; + + protected InetAddress address; + protected int port = DEFAULT_PORT; + protected ObjectOutputStream oos; + protected int reconnectionDelay = DEFAULT_RECONNECTION_DELAY; + + + private Connector connector; + + protected int counter = 0; + + // reset the ObjectOutputStream every 70 calls + private static final int RESET_FREQUENCY = 70; + + // /** + // * Connect to the specified RemoteHost and Port. + // */ + // public void activateOptions() { + // connect(address, port); + // } + + /** + * Start this appender. + */ + public void start() { + int errorCount = 0; + if (port == 0) { + errorCount++; + addError("No port was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_port"); + } + + if (address == null) { + errorCount++; + addError("No remote address was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); + } + + connect(address, port); + + if (errorCount == 0) { + this.started = true; + } + } + + /** + * Strop this appender. + * + * + * This will mark the appender as closed and call then {@link #cleanUp} + * method. + */ + @Override + public void stop() { + if (!isStarted()) + return; + + this.started = false; + cleanUp(); + } + + /** + * Drop the connection to the remote host and release the underlying connector + * thread if it has been created + */ + public void cleanUp() { + if (oos != null) { + try { + oos.close(); + } catch (IOException e) { + addError("Could not close oos.", e); + } + oos = null; + } + if (connector != null) { + addInfo("Interrupting the connector."); + connector.interrupted = true; + connector = null; // allow gc + } + } + + void connect(InetAddress address, int port) { + if (this.address == null) + return; + try { + // First, close the previous connection if any. + cleanUp(); + oos = new ObjectOutputStream(new Socket(address, port).getOutputStream()); + } catch (IOException e) { + + String msg = "Could not connect to remote logback server at [" + + address.getHostName() + "]."; + if (reconnectionDelay > 0) { + msg += " We will try again later."; + fireConnector(); // fire the connector thread + } + addError(msg, e); + } + } + + @Override + protected void append(Object event) { + + if (event == null) + return; + + if (address == null) { + addError("No remote host is set for SocketAppender named \"" + this.name + + "\". For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); + return; + } + + if (oos != null) { + try { + postProcessEvent(event); + oos.writeObject(event); + // addInfo("=========Flushing."); + oos.flush(); + if (++counter >= RESET_FREQUENCY) { + counter = 0; + // Failing to reset the object output stream every now and + // then creates a serious memory leak. + // System.err.println("Doing oos.reset()"); + oos.reset(); + } + } catch (IOException e) { + oos = null; + addWarn("Detected problem with connection: " + e); + if (reconnectionDelay > 0) { + fireConnector(); + } + } + } + } + + protected abstract void postProcessEvent(Object event); + + void fireConnector() { + if (connector == null) { + addInfo("Starting a new connector thread."); + connector = new Connector(); + connector.setDaemon(true); + connector.setPriority(Thread.MIN_PRIORITY); + connector.start(); + } + } + + protected static InetAddress getAddressByName(String host) { + try { + return InetAddress.getByName(host); + } catch (Exception e) { + // addError("Could not find address of [" + host + "].", e); + return null; + } + } + + /** + * The RemoteHost option takes a string value which should be the host + * name of the server where a {@link SocketNode} is running. + */ + public void setRemoteHost(String host) { + address = getAddressByName(host); + remoteHost = host; + } + + /** + * Returns value of the RemoteHost option. + */ + public String getRemoteHost() { + return remoteHost; + } + + /** + * The Port option takes a positive integer representing the port + * where the server is waiting for connections. + */ + public void setPort(int port) { + this.port = port; + } + + /** + * Returns value of the Port option. + */ + public int getPort() { + return port; + } + + + /** + * The ReconnectionDelay option takes a positive integer representing + * the number of milliseconds to wait between each failed connection attempt + * to the server. The default value of this option is 30000 which corresponds + * to 30 seconds. + * + * + * Setting this option to zero turns off reconnection capability. + */ + public void setReconnectionDelay(int delay) { + this.reconnectionDelay = delay; + } + + /** + * Returns value of the ReconnectionDelay option. + */ + public int getReconnectionDelay() { + return reconnectionDelay; + } + + public Layout getLayout() { + return null; + } + + public void setLayout(Layout layout) { + } + + /** + * The Connector will reconnect when the server becomes available again. It + * does this by attempting to open a new connection every + * <code>reconnectionDelay</code> milliseconds. + * + * + * It stops trying whenever a connection is established. It will restart to + * try reconnect to the server when previpously open connection is droppped. + * + * @author Ceki Gülcü + * @since 0.8.4 + */ + class Connector extends Thread { + + boolean interrupted = false; + + public void run() { + Socket socket; + while (!interrupted) { + try { + sleep(reconnectionDelay); + addInfo("Attempting connection to " + address.getHostName()); + socket = new Socket(address, port); + synchronized (this) { + oos = new ObjectOutputStream(socket.getOutputStream()); + connector = null; + addInfo("Connection established. Exiting connector thread."); + break; + } + } catch (InterruptedException e) { + addInfo("Connector interrupted. Leaving loop."); + return; + } catch (java.net.ConnectException e) { + addInfo("Remote host " + address.getHostName() + + " refused connection."); + } catch (IOException e) { + addInfo("Could not connect to " + address.getHostName() + + ". Exception is " + e); + } + } + // addInfo("Exiting Connector.run() method."); + } + + /** + * public void finalize() { LogLog.debug("Connector finalize() has been + * called."); } + */ + } + +}

1 0

svn commit: r1000 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 24 Nov '06

24 Nov '06

Author: seb Date: Fri Nov 24 16:57:01 2006 New Revision: 1000 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java Log: Now using FileSize in SizeBasedTriggeringPolicy Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.java Fri Nov 24 16:57:01 2006 @@ -12,6 +12,8 @@ import java.io.File; +import ch.qos.logback.core.util.FileSize; + /** * SizeBasedTriggeringPolicy looks at size of the file being * currently written to. If it grows bigger than the specified size, @@ -31,8 +33,8 @@ */ public static final long DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB - String maxFileSize = Long.toString(DEFAULT_MAX_FILE_SIZE); - long maxFileSizeAsLong; + String maxFileSizeAsString = Long.toString(DEFAULT_MAX_FILE_SIZE); + FileSize maxFileSize; public SizeBasedTriggeringPolicy() { } @@ -43,16 +45,16 @@ public boolean isTriggeringEvent(final File activeFile, final Object event) { //System.out.println("Size"+file.length()); - return (activeFile.length() >= maxFileSizeAsLong); + return (activeFile.length() >= maxFileSize.getSize()); } public String getMaxFileSize() { - return maxFileSize; + return maxFileSizeAsString; } public void setMaxFileSize(String maxFileSize) { - this.maxFileSize = maxFileSize; - this.maxFileSizeAsLong = toFileSize(maxFileSize); + this.maxFileSizeAsString = maxFileSize; + this.maxFileSize = FileSize.valueOf(maxFileSize); } long toFileSize(String value) {

1 0

svn commit: r999 - in logback/trunk: logback-examples/src/main/java/chapter4/conf/access logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 24 Nov '06

24 Nov '06

Author: seb Date: Fri Nov 24 14:57:58 2006 New Revision: 999 Added: logback/trunk/logback-examples/src/main/java/chapter4/conf/access/ logback/trunk/logback-examples/src/main/java/chapter4/conf/access/logback-SMTP.xml Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Log: small documentation update Added: logback/trunk/logback-examples/src/main/java/chapter4/conf/access/logback-SMTP.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/access/logback-SMTP.xml Fri Nov 24 14:57:58 2006 @@ -0,0 +1,21 @@ +<configuration> + + <appender name="SMTP" + class="ch.qos.logback.access.net.SMTPAppender"> + <layout class="ch.qos.logback.access.html.HTMLLayout"> + <Pattern>%h%l%u%t%r%s%b</Pattern> + </layout> + + + <Evaluator class="ch.qos.logback.access.net.URLEvaluator"> + <URL>url1.jsp</URL> + <URL>directory/url2.html</URL> + </Evaluator> + + <From>sender_email(a)host.com</From> + <SMTPHost>mail.domain.com</SMTPHost> + <To>recipient_email(a)host.com</To> + </appender> + + <appender-ref ref="SMTP" /> +</configuration> \ No newline at end of file Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/appenders.xml Fri Nov 24 14:57:58 2006 @@ -1462,8 +1462,8 @@ The <a href="../xref/ch/qos/logback/classic/net/SMTPAppender.html"><code>SMTPAppender</code></a> accumulates logging events in a fixed-size buffer and sends them in an email when a - user specified triggering event occurs. - By default, the triggering event is taken as the reception of an event + user specified event occurs. + By default, the email is sent as the reception of an event of level ERROR or higher. @@ -2419,13 +2419,42 @@  + <h3>SMTPAppender</h3> + + Access' <code>SMTPAppender</code> works in the same way as its Classic counterpart. + However, the evaluator is rather different. By default, the <code>URLEvaluator</code> + is used by <code>SMTPAppender</code>. This evaluator contains a list of URLs that are + checked agains the current request's URL. When one of the pages given to the + <code>URLEvaluator</code> is requested, <code>SMTPAppender</code> sends an email. + + + + Here is a sample configuration of a <code>SMTPAppender</code> in the access environnement. + +Example 4.15: <code>SMTPAppender</code> configuration (logback-examples/src/main/java/chapter4/conf/access/logback-smtp.xml) +<div class="source"><pre><appender name="SMTP" + class="ch.qos.logback.access.net.SMTPAppender"> + <layout class="ch.qos.logback.access.html.HTMLLayout"> + <Pattern>%h%l%u%t%r%s%b</Pattern> + </layout> + + <Evaluator class="ch.qos.logback.access.net.URLEvaluator"> + <URL>url1.jsp</URL> + <URL>directory/url2.html</URL> + </Evaluator> + <From>sender_email(a)host.com</From> + <SMTPHost>mail.domain.com</SMTPHost> + <To>recipient_email(a)host.com</To> +</appender></pre></div> + + +--> </body> </document> \ No newline at end of file

1 0