- logback-dev - mailman3.qos.ch

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

28 Nov '06

Author: seb Date: Tue Nov 28 16:45:55 2006 New Revision: 1013 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/package.html logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Modified: logback/trunk/logback-access/pom.xml 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/db/DBAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Log: Added a DBAppender to the access module, and a corresponding test case. One dialect only for now. Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Tue Nov 28 16:45:55 2006 @@ -1,9 +1,11 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -25,11 +27,11 @@ </description> <licenses> <license> - <name> GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> </license> - </licenses> - + </licenses> + <dependencies> <dependency> <groupId>ch.qos.logback</groupId> @@ -40,10 +42,10 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <classifier>tests</classifier> + <classifier>tests</classifier> <scope>test</scope> </dependency> - + <dependency> <groupId>tomcat</groupId> <artifactId>catalina</artifactId> @@ -61,12 +63,18 @@ <artifactId>servlet-api-2.5</artifactId> <scope>compile</scope> </dependency> - + <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -95,9 +103,9 @@ </excludes> </configuration> </plugin> - + </plugins> - + </build> </project> \ No newline at end of file Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java Tue Nov 28 16:45:55 2006 @@ -0,0 +1,138 @@ +/** + * 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.db; + +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Enumeration; + +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.db.DBAppenderBase; + +/** + * The DBAppender inserts access events into three database tables in a format + * independent of the Java programming language. + * + * For more informations about this appender, please refer to the online manual at + * http://logback.qos.ch/manual/appenders.html#AccessDBAppender + * + * @author Ceki Gülcü + * @author Ray DeCampo + * @author Sébastien Pennec + */ +public class DBAppender extends DBAppenderBase { + protected static final String insertSQL; + protected final String insertHeaderSQL = "INSERT INTO access_event_header (event_id, header_key, header_value) VALUES (?, ?, ?)"; + protected static final Method GET_GENERATED_KEYS_METHOD; + + static { + StringBuffer sql = new StringBuffer(); + sql.append("INSERT INTO access_event ("); + sql.append("timestmp, "); + sql.append("requestURI, "); + sql.append("requestURL, "); + sql.append("remoteHost, "); + sql.append("remoteUser, "); + sql.append("remoteAddr, "); + sql.append("protocol, "); + sql.append("method, "); + sql.append("serverName, "); + sql.append("postContent) "); + sql.append(" VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?)"); + insertSQL = sql.toString(); + + Method getGeneratedKeysMethod; + try { + getGeneratedKeysMethod = PreparedStatement.class.getMethod( + "getGeneratedKeys", (Class[]) null); + } catch (Exception ex) { + getGeneratedKeysMethod = null; + } + GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod; + } + + public DBAppender() { + } + + @Override + protected void subAppend(Object eventObject, Connection connection, + PreparedStatement insertStatement) throws Throwable { + AccessEvent event = (AccessEvent) eventObject; + + addAccessEvent(insertStatement, event); + + int updateCount = insertStatement.executeUpdate(); + if (updateCount != 1) { + addWarn("Failed to insert access event"); + } + + int eventId = getEventId(insertStatement, connection); + addRequestHeaders(event, connection, eventId); + } + + void addAccessEvent(PreparedStatement stmt, AccessEvent event) + throws SQLException { + stmt.setLong(1, event.getTimeStamp()); + stmt.setString(2, event.getRequestURI()); + stmt.setString(3, event.getRequestURL()); + stmt.setString(4, event.getRemoteHost()); + stmt.setString(5, event.getRemoteUser()); + stmt.setString(6, event.getRemoteAddr()); + stmt.setString(7, event.getProtocol()); + stmt.setString(8, event.getMethod()); + stmt.setString(9, event.getServerName()); + stmt.setString(10, event.getPostContent()); + } + + void addRequestHeaders(AccessEvent event, + Connection connection, int eventId) throws SQLException { + Enumeration names = event.getRequestHeaderNames(); + if (names.hasMoreElements()) { + PreparedStatement insertHeaderStatement = connection + .prepareStatement(insertHeaderSQL); + + + while (names.hasMoreElements()) { + String key = (String) names.nextElement(); + String value = (String) event.getRequestHeader(key); + + insertHeaderStatement.setInt(1, eventId); + insertHeaderStatement.setString(2, key); + insertHeaderStatement.setString(3, value); + + if (cnxSupportsBatchUpdates) { + insertHeaderStatement.addBatch(); + } else { + insertHeaderStatement.execute(); + } + } + + if (cnxSupportsBatchUpdates) { + insertHeaderStatement.executeBatch(); + } + + insertHeaderStatement.close(); + insertHeaderStatement = null; + } + } + + @Override + protected Method getGeneratedKeysMethod() { + return GET_GENERATED_KEYS_METHOD; + } + + @Override + protected String getInsertSQL() { + return insertSQL; + } +} Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/package.html Tue Nov 28 16:45:55 2006 @@ -0,0 +1,23 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + +<p>The ch.qos.logback.access.db package provides means to append access events +into various databases. +</p> + +<p>Most popular database systems, such as PostgreSQL, MySQL, Oracle, DB2 and MsSQL +are supported. +</p> + +<p>Just as importantly, the way for obtaining JDBC connections is pluggable. Connections can +be obtained through the tradinal way of DriverManager, or alternatively as a DataSource. +A DataSource can be instantiated directly or it can obtained through JNDI. +</p> + </body> +</html> \ No newline at end of file Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Tue Nov 28 16:45:55 2006 @@ -206,6 +206,10 @@ return AccessEvent.NA; } } + + public Enumeration getRequestHeaderNames() { + return httpRequest.getHeaderNames(); + } public void buildRequestHeaderMap() { requestHeaderMap = new HashMap<String, Object>(); Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java Tue Nov 28 16:45:55 2006 @@ -0,0 +1,117 @@ +package ch.qos.logback.access.db; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +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; +import ch.qos.logback.core.db.DriverManagerConnectionSource; + +public class DBAppenderTest extends DBAppenderTestBase { + + BasicContext context; + DBAppender appender; + DriverManagerConnectionSource connectionSource; + + public DBAppenderTest(String name) { + super(name); + } + + public void setUp() throws SQLException { + super.setUp(); + context = new BasicContext(); + context.setName("default"); + appender = new DBAppender(); + appender.setName("DB"); + appender.setContext(context); + connectionSource = new DriverManagerConnectionSource(); + connectionSource.setContext(context); + connectionSource.setDriverClass(DRIVER_CLASS); + connectionSource.setUrl(url); + connectionSource.setUser(user); + connectionSource.setPassword(password); + connectionSource.start(); + appender.setConnectionSource(connectionSource); + appender.start(); + } + + public void tearDown() throws SQLException { + super.tearDown(); + context = null; + appender = null; + connectionSource = null; + } + + public void testAppendAccessEvent() throws SQLException { + AccessEvent event = createAccessEvent(); + appender.append(event); + + Statement stmt = connectionSource.getConnection().createStatement(); + ResultSet rs = null; + rs = stmt.executeQuery("SELECT * FROM access_event"); + if (rs.next()) { + assertEquals(event.getTimeStamp(), rs.getLong(1)); + assertEquals(event.getRequestURI(), rs.getString(2)); + assertEquals(event.getRequestURL(), rs.getString(3)); + assertEquals(event.getRemoteHost(), rs.getString(4)); + assertEquals(event.getRemoteUser(), rs.getString(5)); + assertEquals(event.getRemoteAddr(), rs.getString(6)); + assertEquals(event.getProtocol(), rs.getString(7)); + assertEquals(event.getMethod(), rs.getString(8)); + assertEquals(event.getServerName(), rs.getString(9)); + assertEquals(event.getPostContent(), rs.getString(10)); + } else { + fail("No row was inserted in the database"); + } + + rs.close(); + stmt.close(); + } + + public void testAppendHeaders() throws SQLException { + AccessEvent event = createAccessEvent(); + appender.append(event); + + Statement stmt = connectionSource.getConnection().createStatement(); + ResultSet rs = null; + rs = stmt.executeQuery("SELECT * FROM access_event_header where event_id = 0"); + while (rs.next()) { + assertEquals(event.getRequestHeader(rs.getString(2)), rs.getString(3)); + } + + rs.close(); + stmt.close(); + } + + public void testAppendMultipleEvents() throws SQLException { + for (int i = 0; i < 10; i++) { + AccessEvent event = createAccessEvent(); + appender.append(event); + } + + Statement stmt = connectionSource.getConnection().createStatement(); + ResultSet rs = null; + rs = stmt.executeQuery("SELECT * FROM access_event"); + int count = 0; + while (rs.next()) { + count++; + } + assertEquals(10, count); + + rs.close(); + stmt.close(); + } + + private AccessEvent createAccessEvent() { + 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/db/DBAppenderTestBase.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java Tue Nov 28 16:45:55 2006 @@ -0,0 +1,123 @@ +package ch.qos.logback.access.db; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +import junit.framework.TestCase; + +import org.hsqldb.Server; + +public abstract class DBAppenderTestBase extends TestCase { + + public static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; + String serverProps; + String url; + String user = "sa"; + String password = ""; + Server server; + boolean isNetwork = true; + + public DBAppenderTestBase(String name) { + super(name); + } + + public DBAppenderTestBase(String name, String url, boolean isNetwork) { + super(name); + this.isNetwork = isNetwork; + this.url = url; + } + + protected void setUp() throws SQLException { + if (isNetwork) { + if (url == null) { + url = "jdbc:hsqldb:hsql://localhost/test"; + } + + server = new Server(); + + server.setDatabaseName(0, "test"); + server.setDatabasePath(0, "mem:test;sql.enforce_strict_size=true"); + server.setLogWriter(null); + server.setErrWriter(null); + server.start(); + } else { + if (url == null) { + url = "jdbc:hsqldb:file:test;sql.enforce_strict_size=true"; + } + } + + try { + Class.forName(DRIVER_CLASS); + } catch (Exception e) { + e.printStackTrace(); + System.out.println(this + ".setUp() error: " + e.getMessage()); + } + + createTables(); + } + + protected void tearDown() throws SQLException { + dropTables(); + if (isNetwork) { + server.stop(); + server = null; + } + } + + Connection newConnection() throws SQLException { + return DriverManager.getConnection(url, user, password); + } + + void createTables() throws SQLException { + Connection conn = newConnection(); + StringBuffer buf = new StringBuffer(); + buf.append("CREATE TABLE access_event ("); + buf.append("timestmp BIGINT NOT NULL,"); + buf.append("requestURI VARCHAR(254),"); + buf.append("requestURL VARCHAR(254),"); + buf.append("remoteHost VARCHAR(254),"); + buf.append("remoteUser VARCHAR(254),"); + buf.append("remoteAddr VARCHAR(254),"); + buf.append("protocol VARCHAR(254),"); + buf.append("method VARCHAR(254),"); + buf.append("serverName VARCHAR(254),"); + buf.append("postContent VARCHAR(254),"); + buf.append("event_id INT NOT NULL IDENTITY);"); + query(conn, buf.toString()); + + buf = new StringBuffer(); + buf.append("CREATE TABLE access_event_header ("); + buf.append("event_id INT NOT NULL,"); + buf.append("header_key VARCHAR(254) NOT NULL,"); + buf.append("header_value LONGVARCHAR,"); + buf.append("PRIMARY KEY(event_id, header_key),"); + buf.append("FOREIGN KEY (event_id) REFERENCES access_event(event_id));"); + query(conn, buf.toString()); + } + + void dropTables() throws SQLException { + Connection conn = newConnection(); + + StringBuffer buf = new StringBuffer(); + buf.append("DROP TABLE access_event_header IF EXISTS;"); + query(conn, buf.toString()); + + buf = new StringBuffer(); + buf.append("DROP TABLE access_event IF EXISTS;"); + query(conn, buf.toString()); + } + + void query(Connection conn, String expression) throws SQLException { + Statement st = null; + st = conn.createStatement(); + + int i = st.executeUpdate(expression); + if (i == -1) { + System.out.println("db error : " + expression); + } + + st.close(); + } +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Tue Nov 28 16:45:55 2006 @@ -0,0 +1,21 @@ +/** + * 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.db; + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(DBAppenderTest.class); + return suite; + } +} \ No newline at end of file Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java Tue Nov 28 16:45:55 2006 @@ -15,14 +15,16 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; +import java.util.Set; import ch.qos.logback.classic.spi.CallerData; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.db.DBAppenderBase; /** - * The DBAppender inserts loggin events into three database tables in a format + * The DBAppender inserts logging events into three database tables in a format * independent of the Java programming language. * * For more informations about this appender, please refer to the online manual at @@ -33,8 +35,8 @@ * @author Sébastien Pennec */ public class DBAppender extends DBAppenderBase { - protected static final String insertPropertiesSQL = "INSERT INTO logging_event_property (event_id, mapped_key, mapped_value) VALUES (?, ?, ?)"; - protected static final String insertExceptionSQL = "INSERT INTO logging_event_exception (event_id, i, trace_line) VALUES (?, ?, ?)"; + protected final String insertPropertiesSQL = "INSERT INTO logging_event_property (event_id, mapped_key, mapped_value) VALUES (?, ?, ?)"; + protected final String insertExceptionSQL = "INSERT INTO logging_event_exception (event_id, i, trace_line) VALUES (?, ?, ?)"; protected static final String insertSQL; protected static final Method GET_GENERATED_KEYS_METHOD; @@ -139,17 +141,62 @@ } @Override - protected String getInsertExceptionSQL() { - return insertExceptionSQL; + protected String getInsertSQL() { + return insertSQL; } + + protected void insertProperties(Map<String, String> mergedMap, + Connection connection, int eventId) throws SQLException { + Set propertiesKeys = mergedMap.keySet(); + if (propertiesKeys.size() > 0) { + PreparedStatement insertPropertiesStatement = connection + .prepareStatement(insertPropertiesSQL); + + for (Iterator i = propertiesKeys.iterator(); i.hasNext();) { + String key = (String) i.next(); + String value = (String) mergedMap.get(key); + + insertPropertiesStatement.setInt(1, eventId); + insertPropertiesStatement.setString(2, key); + insertPropertiesStatement.setString(3, value); + + if (cnxSupportsBatchUpdates) { + insertPropertiesStatement.addBatch(); + } else { + insertPropertiesStatement.execute(); + } + } + + if (cnxSupportsBatchUpdates) { + insertPropertiesStatement.executeBatch(); + } - @Override - protected String getInsertPropertiesSQL() { - return insertPropertiesSQL; + insertPropertiesStatement.close(); + insertPropertiesStatement = null; + } } + + protected void insertThrowable(String[] strRep, Connection connection, + int eventId) throws SQLException { + + PreparedStatement insertExceptionStatement = connection + .prepareStatement(insertExceptionSQL); + + for (short i = 0; i < strRep.length; i++) { + insertExceptionStatement.setInt(1, eventId); + insertExceptionStatement.setShort(2, i); + insertExceptionStatement.setString(3, strRep[i]); + if (cnxSupportsBatchUpdates) { + insertExceptionStatement.addBatch(); + } else { + insertExceptionStatement.execute(); + } + } + if (cnxSupportsBatchUpdates) { + insertExceptionStatement.executeBatch(); + } + insertExceptionStatement.close(); + insertExceptionStatement = null; - @Override - protected String getInsertSQL() { - return insertSQL; } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Tue Nov 28 16:45:55 2006 @@ -17,9 +17,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.Layout; @@ -40,8 +37,6 @@ protected abstract Method getGeneratedKeysMethod(); protected abstract String getInsertSQL(); - protected abstract String getInsertPropertiesSQL(); - protected abstract String getInsertExceptionSQL(); @Override public void start() { @@ -160,61 +155,6 @@ return eventId; } - protected void insertProperties(Map<String, String> mergedMap, - Connection connection, int eventId) throws SQLException { - Set propertiesKeys = mergedMap.keySet(); - if (propertiesKeys.size() > 0) { - PreparedStatement insertPropertiesStatement = connection - .prepareStatement(getInsertPropertiesSQL()); - - for (Iterator i = propertiesKeys.iterator(); i.hasNext();) { - String key = (String) i.next(); - String value = (String) mergedMap.get(key); - - insertPropertiesStatement.setInt(1, eventId); - insertPropertiesStatement.setString(2, key); - insertPropertiesStatement.setString(3, value); - - if (cnxSupportsBatchUpdates) { - insertPropertiesStatement.addBatch(); - } else { - insertPropertiesStatement.execute(); - } - } - - if (cnxSupportsBatchUpdates) { - insertPropertiesStatement.executeBatch(); - } - - insertPropertiesStatement.close(); - insertPropertiesStatement = null; - } - } - - protected void insertThrowable(String[] strRep, Connection connection, - int eventId) throws SQLException { - - PreparedStatement insertExceptionStatement = connection - .prepareStatement(getInsertExceptionSQL()); - - for (short i = 0; i < strRep.length; i++) { - insertExceptionStatement.setInt(1, eventId); - insertExceptionStatement.setShort(2, i); - insertExceptionStatement.setString(3, strRep[i]); - if (cnxSupportsBatchUpdates) { - insertExceptionStatement.addBatch(); - } else { - insertExceptionStatement.execute(); - } - } - if (cnxSupportsBatchUpdates) { - insertExceptionStatement.executeBatch(); - } - insertExceptionStatement.close(); - insertExceptionStatement = null; - - } - @Override public void stop() { super.stop();

1 0

svn commit: r1012 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net
by noreply.seb＠qos.ch 28 Nov '06

28 Nov '06

Author: seb Date: Tue Nov 28 14:35:19 2006 New Revision: 1012 Modified: 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 Log: minor fixes Modified: 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/SerializationPerfTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SerializationPerfTest.java Tue Nov 28 14:35:19 2006 @@ -37,7 +37,10 @@ int pauseCounter = 0; for (int i = 0; i < loopNumber; i++) { try { - oos.writeObject(buildNewAccessEvent()); + AccessEvent ae = buildNewAccessEvent(); + //average time for the next method: 5000 nanos + ae.prepareForDeferredProcessing(); + oos.writeObject(ae); oos.flush(); if (++resetCounter >= resetFrequency) { oos.reset(); @@ -62,8 +65,11 @@ // System.out.println("Beginning mesured run"); for (int i = 0; i < loopNumber; i++) { try { + AccessEvent ae = buildNewAccessEvent(); t1 = System.nanoTime(); - oos.writeObject(buildNewAccessEvent()); + //average length of the next method: 4000 nanos + ae.prepareForDeferredProcessing(); + oos.writeObject(ae); oos.flush(); t2 = System.nanoTime(); total += (t2 - t1); @@ -79,9 +85,11 @@ fail(ex.getMessage()); } } - total /= 1000; + + total /= (1000);//nanos -> micros System.out.println("Loop done : average time = " + total / loopNumber + " microsecs after " + loopNumber + " writes."); + //average time: 26-30 microsec = 0.034 milis } private AccessEvent buildNewAccessEvent() { Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java Tue Nov 28 14:35:19 2006 @@ -43,6 +43,8 @@ assertEquals(1, mockSocketServer.accessEventList.size()); AccessEvent remoteEvent = mockSocketServer.accessEventList.get(0); + //check that the values are available although the request and response + //objects did not survive serialization assertEquals("headerValue1", remoteEvent.getRequestHeader("headerName1")); assertEquals("testHost", remoteEvent.getRemoteHost()); }

1 0

svn commit: r1011 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex
by noreply.seb＠qos.ch 28 Nov '06

28 Nov '06

Author: seb Date: Tue Nov 28 11:54:39 2006 New Revision: 1011 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java Log: imports optimization Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java Tue Nov 28 11:54:39 2006 @@ -3,9 +3,6 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import ch.qos.logback.access.spi.AccessEvent; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase;

1 0

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

28 Nov '06

Author: seb Date: Tue Nov 28 11:31:41 2006 New Revision: 1010 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java Log: removed request and response from Janino variables added a testcase to PackageTest.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java Tue Nov 28 11:31:41 2006 @@ -20,12 +20,8 @@ static { DEFAULT_PARAM_NAME_LIST.add("event"); - DEFAULT_PARAM_NAME_LIST.add("request"); - DEFAULT_PARAM_NAME_LIST.add("response"); DEFAULT_PARAM_TYPE_LIST.add(AccessEvent.class); - DEFAULT_PARAM_TYPE_LIST.add(HttpServletRequest.class); - DEFAULT_PARAM_TYPE_LIST.add(HttpServletResponse.class); } @@ -66,8 +62,6 @@ Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size()+matcherListSize]; values[i++] = loggingEvent; - values[i++] = loggingEvent.getRequest(); - values[i++] = loggingEvent.getResponse(); for(int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java Tue Nov 28 11:31:41 2006 @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(URLEvaluatorTest.class); + suite.addTestSuite(SocketAppenderTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r1009 - in logback/trunk/logback-site/src/site: resources xdocTemplates
by noreply.ceki＠qos.ch 27 Nov '06

27 Nov '06

Author: ceki Date: Mon Nov 27 22:02:54 2006 New Revision: 1009 Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Log: minor improvements in documentation Modified: logback/trunk/logback-site/src/site/resources/10reasons.ppt ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml Mon Nov 27 22:02:54 2006 @@ -62,11 +62,11 @@ <a href="http://www.qos.ch/pipermail/logback-announce/"> qos.ch - </a> + </a> | <a href="http://marc.theaimsgroup.com/?l=logback-announce"> MARC - </a> + </a> | <a href="http://www.nabble.com/Logback-Announce-f16251.html"> Nabble @@ -86,17 +86,17 @@ <a href="http://qos.ch/mailman/options/logback-user"> Unsubscribe - </a> + </a> </td> <td> <a href="http://www.qos.ch/pipermail/logback-user/"> qos.ch - </a> + </a> | <a href="http://marc.theaimsgroup.com/?l=logback-user"> MARC - </a> + </a> | <a href="http://www.nabble.com/Logback-User-f16252.html"> @@ -117,17 +117,17 @@ <a href="http://qos.ch/mailman/options/logback-dev"> Unsubscribe - </a> + </a> </td> <td> <a href="http://www.qos.ch/pipermail/logback-dev/"> qos.ch - </a> + </a> | <a href="http://marc.theaimsgroup.com/?l=logback-dev"> MARC - </a> + </a> | <a href="http://www.nabble.com/Logback-Dev-f16253.html"> Nabble @@ -135,5 +135,12 @@ </td> </tr> </table> + + <h2>On IRC</h2> + + <p>We can also be reached by IRC at <code><span + class="big">irc.freenode.net#logback</span>.</code> + </p> + </body> </document> Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Mon Nov 27 22:02:54 2006 @@ -923,7 +923,7 @@ log a statement. </p> - + <h4>Better alternative</h4> @@ -964,9 +964,9 @@ <div class="source"><pre>logger.debug("The new entry is {}. It replaces {}.", entry, oldEntry);</pre></div> - <p> - If three or more arguments need to be passed, an <code>Object[]</code> - variant is also availalble. For example, you can write: + <p>If three or more arguments need to be passed, an + <code>Object[]</code> variant is also availalble. For example, you + can write: </p> @@ -975,32 +975,32 @@ <h3>Configuration</h3> - <p> - Inserting log requests into the application code requires a fair - amount of planning and effort. Observation shows that - approximately four percent of code is dedicated to - logging. Consequently, even moderately sized applications will - contain thousands of logging statements embedded within its - code. Given their number, it becomes imperative to manage these - log statements without the need to modify them manually. + <p>Inserting log requests into the application code requires a + fair amount of planning and effort. Observation shows that + approximately four percent of code is dedicated to + logging. Consequently, even moderately sized applications will + contain thousands of logging statements embedded within its + code. Given their number, it becomes imperative to manage these + log statements without the need to modify them manually. </p> - <p> - The logback environment is fully configurable programmatically. - However, it is far more flexible to configure logback using - configuration files. In logback, configuration files are - expressed in XML. + + <p>The logback environment is fully configurable programmatically. + However, it is far more flexible to configure logback using + configuration files. In logback, configuration files are expressed + in XML. </p> - <p> - Existing log4j users can convert their <em>log4j.properties</em> - files to <em>logback.xml</em> using <a - href="http://logback.qos.ch/translator/">PropertiesTranslator</a> - web-application. + + <p>Existing log4j users can convert their + <em>log4j.properties</em> files to <em>logback.xml</em> using <a + href="http://logback.qos.ch/translator/">PropertiesTranslator</a> + web-application. </p> - <p> - Let us give a taste of how logback configuration is done with the help of an - imaginary application <em>MyApp</em> that uses logback. + + <p>Let us give a taste of how logback configuration is done with + the help of a trivial application named <em>MyApp</em>. </p> - <em>Example 1.4: Basic configuration (logback-examples/src/main/java/chapter1/MyApp.java)</em> + + <em>Example 1.4: Basic configuration (<a href="xref/chapter1/MyApp.html">logback-examples/src/main/java/chapter1/MyApp.java</a>)</em> <div class="source"><pre>package chapter1; // Import SLF4J classes. @@ -1024,12 +1024,19 @@ logger.info("Exiting application."); } }</pre></div> - <p> - This class defines a logger instance variable - with the name MyApp. It then uses the Bar class, defined as shown below: + + <p>This class defines a logger instance variable with the name + <em>MyApp</em>. It then instantiates a <code>Bar</code> + object. The <code>Bar</code> class is listed below: </p> - <em>Example 1.4: Basic configuration (logback-examples/src/main/java/chapter1/Bar.java)</em> -<div class="source"><pre>class Bar { + + <em>Example 1.4: Basic configuration (<a href="xref/chapter1/Bar.html">logback-examples/src/main/java/chapter1/Bar.java</a>)</em> +<div class="source"><pre>package chapter1; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class Bar { Logger logger = LoggerFactory.getLogger(Bar.class); @@ -1037,56 +1044,42 @@ logger.debug("doing my job"); } }</pre></div> - <p> - The invocation of the BasicConfigurator create, as we have seen, - a simple yet sufficient logback setup. By default, - the root Logger is assigned to Level.DEBUG. + + <p>The invocation of the <code>configureDefaultContext()</code> + method in <code>BasicConfigurator</code> creates, as we have seen + previously, a minimal logback setup. Note that, by default, the + root Logger is assigned to Level.DEBUG. </p> - <p>The BasicConfigurator has to be called only once. Any other class that wishes to - issue log statements only has to import the <em>Logger</em> class and use it.</p> + <p> The output of MyApp is: </p> -<div class="source"><pre>0 [main] INFO ch.qos.logback.classic.examples.MyApp - Entering application. -0 [main] DEBUG ch.qos.logback.classic.examples.Bar - doing my job -0 [main] INFO ch.qos.logback.classic.examples.MyApp - Exiting application.</pre></div> - - <p>Let's configure logback to do exactly the same output, this time - with an XML configuration file.</p> - <em>Example 1.4: Basic configuration (logback-examples/src/main/java/chapter1/sample-config-1.xml)</em> -<div class="source"><pre><?xml version="1.0" encoding="UTF-8" ?> +<div class="source"><pre>22:05:21.461 [main] INFO chapter1.MyApp - Entering application. +22:05:21.461 [main] DEBUG chapter1.Bar - doing my job +22:05:21.461 [main] INFO chapter1.MyApp - Exiting application.</pre></div> -<configuration> + - <appender name="STDOUT" - class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <param name="pattern" - value="%-4relative [%thread] %-5level %class - %msg%n" /> - </layout> - </appender> + <p><em>MyApp</em> configures logback by invoking + <code>BasicConfigurator.configureDefaultContext()</code>. All + other classes only need to retrieve an instance of + <code>org.slf4j.Logger</code> by calling + <code>LoggerFactory.getLogger()</code>, and then log away. For + example, the only dependence of the <code>Bar</code> class is on + <code>org.slf4j.Logger</code> and + <code>org.slf4j.LoggerFactory</code>. Except code that configures + logback (if such code exists) user code does not need to depend on + logback, but on SLF4J instead. + </p> + + <p>The previous example output logging information always in the + same fixed format. Fortunately, it is easy to modify an + application so that logging environment is configured at runtime. + </p> - <root> - <level value="debug" /> - <appender-ref ref="STDOUT" /> - </root> -</configuration></pre></div> - - <p>We first created an <code>Appender</code>, named <em>STDOUT</em> that is of <code>ConsoleAppender</code> tye. Its layout - is managed by a PatternLayout, that uses the value of the "pattern" parameter to generate - the logging statement. We then configured the root logger, set its level to DEBUG, - and linked the newly configured <code>ConsoleAppender</code> to the root logger.</p> - <p>Note that we've set the root logger level explicitly. Since root logger have a DEBUG level - by default we could have omitted this.</p> - - <p>To run this examle, use this command:</p> - -<div class="source"><pre>java chapter1.MyApp sample-config-1.xml</pre></div> + <em>Example 1.5: Logback configuration from file ((<a + href="xref/chapter1/MyAppWithConfigFile.html">logback-examples/src/main/java/chapter1/MyAppWithConfigFile.java</a>)</em> - <p>The console output will be exactly the same as before. However, this time, we didn't need - to import and call the BasicConfigurator class, as you can see in the following code section: - </p> - <em>Example 1.5: Logback configuration from file (logback-examples/src/main/java/chapter1/MyAppWithConfigFile.java)</em> <div class="source"><pre>package chapter1; //Import SLF4J classes. @@ -1115,18 +1108,73 @@ StatusPrinter.print(lc.getStatusManager()); } }</pre></div> - <p> - We used the JoranConfigurator class to parse the configuration file we just created. - Joran is a XML interpreter, similar to the commons-digester API, but offering several - advantages over commons-digester. Here, it parses the xml file and runs actions depending - on the tags it finds. - To setup the JoranConfigurator properly, we passed the <code>LoggerContext</code>. A <code>LoggerContext</code> - is the class that creates and manages Loggers in logback. - It is also the class that implements the <code>org.slf4j.ILoggerFactory</code> interface. + + <p>MyApp2 instructs PropertyConfigurator to parse a configuration + file and to set up logging according to the instructions found + therein. The sample configuration file listed below, also + available as examples/chapter3/sample0.properties, configures + log4j (after parsing by PropertyConfigurator) in the same way as + BasicCon-figurator.configure. + </p> + + <p>Let us configure logback in the exact same way, + but this time with an XML configuration file. The next + configuration file, once executed, will have the same affect as + calling <code>BasicConfigrator</code>.</p> + + <em>Example 1.4: Basic configuration (logback-examples/src/main/java/chapter1/sample-config-1.xml)</em> +<div class="source"><pre><?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration></pre></div> + + <p>We first created an <code>Appender</code>, named <em>STDOUT</em> + that is of <code>ConsoleAppender</code> tye. Its layout is managed + by a PatternLayout, that uses the value of the "pattern" parameter + to generate the logging statement. We then configured the root + logger, set its level to DEBUG, and linked the newly configured + <code>ConsoleAppender</code> to the root logger.</p> + + <p>Note that we've set the root logger level explicitly. Since root + logger have a DEBUG level by default we could have omitted this.</p> + + <p>To run this examle, use this command:</p> + +<div class="source"><pre>java chapter1.MyApp <b>HOW ABOUT PATH?</b>sample-config-1.xml</pre></div> + + <p>The console output will be exactly the same as before. However, + this time, we didn't need to import and call the BasicConfigurator + class, as you can see in the following code section: </p> - <p>Logging to the console is a rather simple example. Let's now configure logback - so that it logs to the console, but also to a custom file.</p> + + <p>We used the JoranConfigurator class to parse the configuration + file we just created. Joran is a XML interpreter, similar to the + commons-digester API, but offering several advantages over + commons-digester. Here, it parses the xml file and runs actions + depending on the tags it finds. To setup the JoranConfigurator + properly, we passed the <code>LoggerContext</code>. A + <code>LoggerContext</code> is the class that creates and manages + Loggers in logback. It is also the class that implements the + <code>org.slf4j.ILoggerFactory</code> interface. + </p> + + <p>Logging to the console is a rather simple example. Let's now + configure logback so that it logs to the console, but also to a + custom file.</p> + <em>Example 1.5: Logback configuration from file (logback-examples/src/main/java/chapter1/sample-config-2.xml)</em> <div class="source"><pre><?xml version="1.0" encoding="UTF-8" ?> @@ -1157,15 +1205,19 @@ </root> </configuration></pre></div> - <p>Now, all the logging statements are directed to the console and to a file named <em>sample-log.txt</em>. - As you can see, the configuration needed to add an Appender is rather small. The param element, in either - Appender configuration, reads the <em>name</em> attribute and assigns its value to the corresponding attribute - in the specified java class. + <p>Now, all the logging statements are directed to the console and + to a file named <em>sample-log.txt</em>. As you can see, the + configuration needed to add an Appender is rather small. The param + element, in either Appender configuration, reads the <em>name</em> + attribute and assigns its value to the corresponding attribute in + the specified java class. </p> - <p>Suppose that we do not want to see the DEBUG level statements in the chapter1 package anymore. - This is done by adding the following xml snippet to the configuration file, right before - the <code><root></code> element.</p> + <p>Suppose that we do not want to see the DEBUG level statements in + the chapter1 package anymore. This is done by adding the following + xml snippet to the configuration file, right before the + <code><root></code> element.</p> + <em>Example 1.5: Logback configuration from file (logback-examples/src/main/java/chapter1/sample-config-3.xml)</em> <div class="source"><pre><?xml version="1.0" encoding="UTF-8" ?>

1 0

svn commit: r1008 - logback/trunk
by noreply.ceki＠qos.ch 27 Nov '06

27 Nov '06

Author: ceki Date: Mon Nov 27 22:01:56 2006 New Revision: 1008 Modified: logback/trunk/pom.xml Log: include sources when packaging Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Nov 27 22:01:56 2006 @@ -127,6 +127,20 @@ <version>1.0-beta-1</version> </extension> </extensions> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> <reporting> @@ -224,9 +238,6 @@ </goals> </configuration> </plugin> - - - </plugins> </reporting>

1 0

svn commit: r1007 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/boolex test/java/ch/qos/logback/core/boolex
by noreply.seb＠qos.ch 27 Nov '06

27 Nov '06

Author: seb Date: Mon Nov 27 20:24:38 2006 New Revision: 1007 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/boolex/ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/boolex/MatcherTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/Matcher.java Log: Modified the Matcher to use the find() method instead of the matches() method. Added a test case verifying its behaviour Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/Matcher.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/Matcher.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/Matcher.java Mon Nov 27 20:24:38 2006 @@ -42,6 +42,7 @@ code |= Pattern.UNICODE_CASE; } + //code |= Pattern.DOTALL; pattern = Pattern.compile(regex, code); start = true; @@ -71,7 +72,7 @@ public boolean matches(String input) throws EvaluationException { if(start) { java.util.regex.Matcher matcher = pattern.matcher(input); - return matcher.matches(); + return matcher.find(); } else { throw new EvaluationException("Matcher ["+regex+"] not started"); } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/boolex/MatcherTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/boolex/MatcherTest.java Mon Nov 27 20:24:38 2006 @@ -0,0 +1,64 @@ +package ch.qos.logback.core.boolex; + +import junit.framework.TestCase; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; + +public class MatcherTest extends TestCase { + + Context context; + Matcher matcher; + + public void setUp() throws Exception { + context = new ContextBase(); + matcher = new Matcher(); + matcher.setContext(context); + matcher.setName("testMatcher"); + super.setUp(); + } + + public void tearDown() throws Exception { + matcher = null; + super.tearDown(); + } + + public void testFullRegion() throws Exception { + matcher.setRegex(".*test.*"); + matcher.start(); + assertTrue(matcher.matches("test")); + assertTrue(matcher.matches("xxxxtest")); + assertTrue(matcher.matches("testxxxx")); + assertTrue(matcher.matches("xxxxtestxxxx")); + } + + public void testPartRegion() throws Exception { + matcher.setRegex("test"); + matcher.start(); + assertTrue(matcher.matches("test")); + assertTrue(matcher.matches("xxxxtest")); + assertTrue(matcher.matches("testxxxx")); + assertTrue(matcher.matches("xxxxtestxxxx")); + } + + public void testCaseInsensitive() throws Exception { + matcher.setRegex("test"); + matcher.setCaseSensitive(false); + matcher.start(); + + assertTrue(matcher.matches("TEST")); + assertTrue(matcher.matches("tEst")); + assertTrue(matcher.matches("tESt")); + assertTrue(matcher.matches("TesT")); + } + + public void testCaseSensitive() throws Exception { + matcher.setRegex("test"); + matcher.setCaseSensitive(true); + matcher.start(); + + assertFalse(matcher.matches("TEST")); + assertFalse(matcher.matches("tEst")); + assertFalse(matcher.matches("tESt")); + assertFalse(matcher.matches("TesT")); + } +}

1 0

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