October 2008 - logback-dev - mailman3.qos.ch

[JIRA] Resolved: (LBCORE-50) FlushableAppender
by Ceki Gulcu (JIRA) 27 Oct '08

27 Oct '08

[ http://jira.qos.ch/browse/LBCORE-50?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-50. ------------------------------ Resolution: Duplicate > FlushableAppender > ----------------- > > Key: LBCORE-50 > URL: http://jira.qos.ch/browse/LBCORE-50 > Project: logback-core > Issue Type: Improvement > Components: Appender > Affects Versions: unspecified > Environment: Operating System: Linux > Platform: PC > Reporter: Bruno Navert > Assignee: Logback dev list > Priority: Minor > > Have appender implement the java.io.Flushable interface, or a logback-specific interface if preferred, so that we can call Appender.flush() to manually flush the appender's writer. Not all appenders would have this, only those that implement Flushable. > This would be useful in the context where buffered IO is used, but we still want to ensure a flush is made at specific intervals. For instance, in development I create a Spring bean that listens to application events, and force-flushes logback after each http request has been processed by my application, ensuring that I always see all the error logs when something fails. > I have accomplished by subclassing RollingFileAppender to implement Flushable, quite simply like this: > public void flush() throws IOException > { > writer.flush(); > } -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

svn commit: r1876 - in logback/trunk/logback-classic/src: main/java/org/slf4j/impl test/java/ch/qos/logback/classic test/java/org/slf4j test/java/org/slf4j/impl
by noreply.ceki＠qos.ch 27 Oct '08

27 Oct '08

Author: ceki Date: Mon Oct 27 15:41:52 2008 New Revision: 1876 Added: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/CopyOnInheritThreadLocal.java logback/trunk/logback-classic/src/test/java/org/slf4j/ logback/trunk/logback-classic/src/test/java/org/slf4j/impl/ logback/trunk/logback-classic/src/test/java/org/slf4j/impl/LogbackMDCAdapterTest.java logback/trunk/logback-classic/src/test/java/org/slf4j/impl/PackageTest.java Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Log: - making sure that LogbackMDCAdapter actually copies its hash map. Strictly speaking, there is no need for copy-on-spawn because every change in the MDC already results in a copy of the hash map. Nevertheless, this change makes it easier for readers of the code to follow it. An external observer should not be able to tell the difference between the old and the new code. Added: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/CopyOnInheritThreadLocal.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/CopyOnInheritThreadLocal.java Mon Oct 27 15:41:52 2008 @@ -0,0 +1,24 @@ +package org.slf4j.impl; + +import java.util.HashMap; + +/** + * This class extends InheritableThreadLocal so that children threads get a copy + * of the parent's hashmap. + * + * @author Ceki Gülcü + */ +public class CopyOnInheritThreadLocal extends + InheritableThreadLocal<HashMap<String, String>> { + + /** + * Child threads should get a copy of the parent's hashmap. + */ + @Override + protected HashMap<String, String> childValue( + HashMap<String, String> parentValue) { + HashMap<String, String> hm = new HashMap<String, String>(parentValue); + return hm; + } + +} Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java Mon Oct 27 15:41:52 2008 @@ -24,7 +24,9 @@ */ public class LogbackMDCAdapter implements MDCAdapter { - private final InheritableThreadLocal<HashMap<String, String>> inheritableThreadLocal = new InheritableThreadLocal<HashMap<String, String>>(); + //final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new CopyOnInheritThreadLocal(); + + final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new CopyOnInheritThreadLocal(); LogbackMDCAdapter() { } @@ -45,21 +47,21 @@ * logback component to see the latest changes. * * @throws IllegalArgumentException - * in case the "key" parameter is null + * in case the "key" parameter is null */ public void put(String key, String val) throws IllegalArgumentException { if (key == null) { throw new IllegalArgumentException("key cannot be null"); } - HashMap<String, String> oldMap = inheritableThreadLocal.get(); + HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); HashMap<String, String> newMap = new HashMap<String, String>(); if (oldMap != null) { newMap.putAll(oldMap); } // the newMap replaces the old one for serialisation's sake - inheritableThreadLocal.set(newMap); + copyOnInheritThreadLocal.set(newMap); newMap.put(key, val); } @@ -70,7 +72,7 @@ * This method has no side effects. */ public String get(String key) { - HashMap<String, String> hashMap = inheritableThreadLocal.get(); + HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); if ((hashMap != null) && (key != null)) { return hashMap.get(key); @@ -89,14 +91,14 @@ * logback component to see the latest changes. */ public void remove(String key) { - HashMap<String, String> oldMap = inheritableThreadLocal.get(); + HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); HashMap<String, String> newMap = new HashMap<String, String>(); if (oldMap != null) { newMap.putAll(oldMap); } // the newMap replaces the old one for serialisation's sake - inheritableThreadLocal.set(newMap); + copyOnInheritThreadLocal.set(newMap); newMap.remove(key); } @@ -104,11 +106,11 @@ * Clear all entries in the MDC. */ public void clear() { - HashMap<String, String> hashMap = inheritableThreadLocal.get(); + HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); if (hashMap != null) { hashMap.clear(); - inheritableThreadLocal.remove(); + copyOnInheritThreadLocal.remove(); } } @@ -117,15 +119,15 @@ * internally. */ public Map<String, String> getPropertyMap() { - return inheritableThreadLocal.get(); + return copyOnInheritThreadLocal.get(); } /** - * Return a copy of the current thread's context map. - * Returned value may be null. + * Return a copy of the current thread's context map. Returned value may be + * null. */ public Map getCopyOfContextMap() { - HashMap<String, String> hashMap = inheritableThreadLocal.get(); + HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); if (hashMap == null) { return null; } else { @@ -133,13 +135,12 @@ } } - /** * Returns the keys in the MDC as a {@link Set}. The returned value can be * null. */ public Set<String> getKeys() { - HashMap<String, String> hashMap = inheritableThreadLocal.get(); + HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); if (hashMap != null) { return hashMap.keySet(); @@ -148,17 +149,16 @@ } } - - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") public void setContextMap(Map contextMap) { - HashMap<String, String> oldMap = inheritableThreadLocal.get(); + HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); HashMap<String, String> newMap = new HashMap<String, String>(); newMap.putAll(contextMap); // the newMap replaces the old one for serialisation's sake - inheritableThreadLocal.set(newMap); - + copyOnInheritThreadLocal.set(newMap); + // hints for the garbage collector oldMap.clear(); oldMap = null; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Mon Oct 27 15:41:52 2008 @@ -17,7 +17,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); - + + suite.addTest(org.slf4j.impl.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.joran.PackageTest.suite()); Added: logback/trunk/logback-classic/src/test/java/org/slf4j/impl/LogbackMDCAdapterTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/org/slf4j/impl/LogbackMDCAdapterTest.java Mon Oct 27 15:41:52 2008 @@ -0,0 +1,82 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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 org.slf4j.impl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Random; + +import org.junit.Test; +import org.slf4j.MDC; + +public class LogbackMDCAdapterTest { + + final static String A_SUFFIX = "A_SUFFIX"; + + int diff = new Random().nextInt(); + + /** + * Test that LogbackMDCAdapter copies its hashmap when a child + * thread inherits it. + * + * @throws InterruptedException + */ + @Test + public void copyOnInheritence() throws InterruptedException { + String mdcKey = "x" + diff; + String otherMDCKey = "o" + diff; + MDC.put(mdcKey, mdcKey + A_SUFFIX); + + HashMap<String, String> parentHM = getHM(); + + MyThread myThread = new MyThread(mdcKey, otherMDCKey); + myThread.start(); + myThread.join(); + + assertNull(MDC.get(otherMDCKey)); + assertTrue(myThread.successul); + assertTrue(parentHM != myThread.childHM); + } + + class MyThread extends Thread { + + String mdcKey; + String otherMDCKey; + boolean successul; + HashMap<String, String> childHM; + + MyThread(String mdcKey, String otherMDCKey) { + this.mdcKey = mdcKey; + this.otherMDCKey = otherMDCKey; + } + + @Override + public void run() { + childHM = getHM(); + + MDC.put(otherMDCKey, otherMDCKey + A_SUFFIX); + assertNotNull(MDC.get(mdcKey)); + assertEquals(mdcKey + A_SUFFIX, MDC.get(mdcKey)); + assertEquals(otherMDCKey + A_SUFFIX, MDC.get(otherMDCKey)); + successul = true; + } + } + + HashMap<String, String> getHM() { + LogbackMDCAdapter lma = (LogbackMDCAdapter) MDC.getMDCAdapter(); + CopyOnInheritThreadLocal copyOnInheritThreadLocal = lma.copyOnInheritThreadLocal; + return copyOnInheritThreadLocal.get(); + + } +} Added: logback/trunk/logback-classic/src/test/java/org/slf4j/impl/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/org/slf4j/impl/PackageTest.java Mon Oct 27 15:41:52 2008 @@ -0,0 +1,21 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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 org.slf4j.impl; + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTest(new JUnit4TestAdapter(LogbackMDCAdapterTest.class)); + return suite; + } +} \ No newline at end of file

1 0

svn commit: r1860 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/db logback-classic logback-classic/src/main/java/ch/qos/logback/classic/db logback-classic/src/test/input/integration logback-classic/src/test/input/integration/db logback-classic/src/test/java/ch/qos/logback/classic/db logback-core/src/main/java/ch/qos/logback/core/db logback-core/src/main/java/ch/qos/logback/core/db/dialect logback-examples logback-examples/src/main/java/chapter4/mail logback-site/src/si
by noreply.ceki＠qos.ch 27 Oct '08

27 Oct '08

Author: ceki Date: Wed Oct 22 22:50:47 2008 New Revision: 1860 Added: logback/trunk/logback-classic/src/test/input/integration/ logback/trunk/logback-classic/src/test/input/integration/db/ logback/trunk/logback-classic/src/test/input/integration/db/mysql-with-driver.xml logback/trunk/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml logback/trunk/logback-classic/src/test/input/integration/db/oracle11g-with-driver.xml logback/trunk/logback-classic/src/test/input/integration/db/postgresql-with-driver.xml logback/trunk/logback-classic/src/test/input/integration/db/sqlserver-with-driver.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java logback/trunk/logback-classic/pom.xml 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/ConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java 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/DataSourceConnectionSource.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/HSQLDBDialect.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialect.java logback/trunk/logback-examples/pom.xml logback/trunk/logback-examples/src/main/java/chapter4/mail/ (props changed) logback/trunk/logback-site/src/site/pages/manual/appenders.html Log: Related to LBCORE-15 - minor refactoring in DBAppender and related classes - As suggested by John Gibson in LBCORE-15, we now use the prepareStatement method of Connection which takes the sql statement followed by the autogenerateed key columnNames (of type String[]) This change is compatible with JDBC drivers of SQLServer and MySQL, as well as Oracle. JDBC drivers not supporting getGeneratedKeys are not affected by this change. - added integration tests which are active only on my machine, namely, Orion. This avoids other developers from having to install Oracle, MySQL, Postgres and SQL Server just for the logback tests to pass. - similar tests on logback-access to follow. Modified: 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/DBAppender.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java Wed Oct 22 22:50:47 2008 @@ -79,7 +79,7 @@ } if (insertHeaders) { - int eventId = getEventId(insertStatement, connection); + int eventId = selectEventId(insertStatement, connection); addRequestHeaders(event, connection, eventId); } } Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Wed Oct 22 22:50:47 2008 @@ -171,8 +171,46 @@ </configuration> </plugin> </plugins> + </build> + <profiles> + + <profile> +  + <id>host-orion</id> + + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> + <scope>test</scope> + </dependency> - </build> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-507.jdbc3</version> + </dependency> + +  + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>sqljdbc</artifactId> + <version>2.0</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + </profile> + + </profiles> </project> \ 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 Wed Oct 22 22:50:47 2008 @@ -56,11 +56,11 @@ sql.append("caller_line) "); sql.append(" VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?,?)"); insertSQL = sql.toString(); - // - // PreparedStatement.getGeneratedKeys added in JDK 1.4 - // + + // PreparedStatement.getGeneratedKeys() method was added in JDK 1.4 Method getGeneratedKeysMethod; try { + // the getGeneratedKeysMethod = PreparedStatement.class.getMethod( "getGeneratedKeys", (Class[]) null); } catch (Exception ex) { @@ -77,16 +77,16 @@ PreparedStatement insertStatement) throws Throwable { LoggingEvent event = (LoggingEvent) eventObject; - addLoggingEvent(insertStatement, event); - // This is very expensive... should we do it every time? - addCallerData(insertStatement, event.getCallerData()); + bindLoggingEventWithInsertStatement(insertStatement, event); + // This is expensive... should we do it every time? + bindCallerDataWithPreparedStatement(insertStatement, event.getCallerData()); int updateCount = insertStatement.executeUpdate(); if (updateCount != 1) { addWarn("Failed to insert loggingEvent"); } - int eventId = getEventId(insertStatement, connection); + int eventId = selectEventId(insertStatement, connection); Map<String, String> mergedMap = mergePropertyMaps(event); insertProperties(mergedMap, connection, eventId); @@ -96,7 +96,7 @@ } } - void addLoggingEvent(PreparedStatement stmt, LoggingEvent event) + void bindLoggingEventWithInsertStatement(PreparedStatement stmt, LoggingEvent event) throws SQLException { stmt.setLong(1, event.getTimeStamp()); stmt.setString(2, event.getFormattedMessage()); @@ -106,7 +106,7 @@ stmt.setShort(6, DBHelper.computeReferenceMask(event)); } - void addCallerData(PreparedStatement stmt, CallerData[] callerDataArray) + void bindCallerDataWithPreparedStatement(PreparedStatement stmt, CallerData[] callerDataArray) throws SQLException { CallerData callerData = callerDataArray[0]; if (callerData != null) { Added: logback/trunk/logback-classic/src/test/input/integration/db/mysql-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/integration/db/mysql-with-driver.xml Wed Oct 22 22:50:47 2008 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>com.mysql.jdbc.Driver</driverClass> + <url>jdbc:mysql://localhost:3306/logback</url> + <user>root</user> + <password></password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> +</configuration> Added: logback/trunk/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml Wed Oct 22 22:50:47 2008 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>oracle.jdbc.OracleDriver</driverClass> + <url>jdbc:oracle:thin:@localhost:1522:xe</url> + <user>hr</user> + <password>hr</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> +</configuration> Added: logback/trunk/logback-classic/src/test/input/integration/db/oracle11g-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/integration/db/oracle11g-with-driver.xml Wed Oct 22 22:50:47 2008 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>oracle.jdbc.OracleDriver</driverClass> + <url>jdbc:oracle:thin:@localhost:1521:orcl</url> + <user>SCOTT</user> + <password>SCOTT</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> +</configuration> Added: logback/trunk/logback-classic/src/test/input/integration/db/postgresql-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/integration/db/postgresql-with-driver.xml Wed Oct 22 22:50:47 2008 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>org.postgresql.Driver</driverClass> + <url>jdbc:postgresql://192.168.1.5:5432/test</url> + <user>logback</user> + <password>logback</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> +</configuration> Added: logback/trunk/logback-classic/src/test/input/integration/db/sqlserver-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/integration/db/sqlserver-with-driver.xml Wed Oct 22 22:50:47 2008 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>com.microsoft.sqlserver.jdbc.SQLServerDriver</driverClass> + <url>jdbc:sqlserver://localhost:1987;databaseName=logback;</url> + <user>logback</user> + <password>logback</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> +</configuration> Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java Wed Oct 22 22:50:47 2008 @@ -0,0 +1,126 @@ +package ch.qos.logback.classic.db; + +import static org.junit.Assert.assertEquals; + +import java.net.InetAddress; +import java.util.Random; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.MDC; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.util.StatusPrinter; + +public class DBAppenderIntegrationTest { + + static String LOCAL_HOST_NAME; + static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; + + int diff = new Random(System.nanoTime()).nextInt(10000); + LoggerContext lc = new LoggerContext(); + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + InetAddress localhostIA = InetAddress.getLocalHost(); + LOCAL_HOST_NAME = localhostIA.getHostName(); + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + lc.setName("lc"+diff); + } + + @After + public void tearDown() throws Exception { + lc.shutdownAndReset(); + } + + public void doTest(String configFile) throws JoranException { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(configFile); + + Logger logger = lc.getLogger(DBAppenderIntegrationTest.class); + + MDC.put("userid", "user" + diff); + int runLength = 5; + for (int i = 1; i <= runLength; i++) { + logger.debug("This is a debug message. Message number: " + i); + } + logger.error("At last an error.", new Exception("Just testing")); + + // check that there were no errors + StatusPrinter.print(lc); + assertEquals(Status.INFO, lc.getStatusManager().getLevel()); + + } + + static boolean isConformingHost() { + for (String conformingHost : CONFORMING_HOST_LIST) { + if (conformingHost.equalsIgnoreCase(LOCAL_HOST_NAME)) { + return true; + } + } + return false; + } + + @Test + public void sqlserver() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/sqlserver-with-driver.xml"); + } + + @Test + public void oracle10g() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/oracle10g-with-driver.xml"); + } + + @Test + @Ignore + public void oracle11g() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/oracle11g-with-driver.xml"); + } + + @Test + public void mysql() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/mysql-with-driver.xml"); + } + + @Test + public void postgres() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/postgresql-with-driver.xml"); + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSource.java Wed Oct 22 22:50:47 2008 @@ -12,6 +12,7 @@ import java.sql.Connection; import java.sql.SQLException; +import ch.qos.logback.core.db.dialect.SQLDialectCode; import ch.qos.logback.core.spi.LifeCycle; @@ -27,12 +28,6 @@ */ public interface ConnectionSource extends LifeCycle { - final int UNKNOWN_DIALECT = 0; - final int POSTGRES_DIALECT = 1; - final int MYSQL_DIALECT = 2; - final int ORACLE_DIALECT = 3; - final int MSSQL_DIALECT = 4; - final int HSQL_DIALECT = 5; /** * Obtain a {@link java.sql.Connection} for use. The client is * responsible for closing the {@link java.sql.Connection} when it is no @@ -48,7 +43,7 @@ * dialect is not needed if the JDBC driver supports the getGeneratedKeys * method. */ - int getSQLDialectCode(); + SQLDialectCode getSQLDialectCode(); /** * If the connection supports the JDBC 3.0 getGeneratedKeys method, then Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java Wed Oct 22 22:50:47 2008 @@ -14,6 +14,7 @@ import java.sql.SQLException; import ch.qos.logback.core.db.dialect.DBUtil; +import ch.qos.logback.core.db.dialect.SQLDialectCode; import ch.qos.logback.core.spi.ContextAwareBase; @@ -28,7 +29,7 @@ private String password = null; // initially we have an unkonw dialect - private int dialectCode = UNKNOWN_DIALECT; + private SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT; private boolean supportsGetGeneratedKeys = false; private boolean supportsBatchUpdates = false; @@ -50,6 +51,10 @@ supportsGetGeneratedKeys = util.supportsGetGeneratedKeys(meta); supportsBatchUpdates = util.supportsBatchUpdates(meta); dialectCode = DBUtil.discoverSQLDialect(meta); + System.out.println("Driver name="+meta.getDriverName()); + System.out.println("Driver version="+meta.getDriverVersion()); + System.out.println("supportsGetGeneratedKeys="+supportsGetGeneratedKeys); + } catch (SQLException se) { addWarn("Could not discover the dialect to use.", se); } @@ -62,7 +67,7 @@ return supportsGetGeneratedKeys; } - public final int getSQLDialectCode() { + public final SQLDialectCode getSQLDialectCode() { return dialectCode; } 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 Wed Oct 22 22:50:47 2008 @@ -35,8 +35,9 @@ protected SQLDialect sqlDialect; protected abstract Method getGeneratedKeysMethod(); + protected abstract String getInsertSQL(); - + @Override public void start() { @@ -45,6 +46,7 @@ "DBAppender cannot function without a connection source"); } + System.out.println(connectionSource.supportsGetGeneratedKeys()); sqlDialect = DBUtil .getDialectFromCode(connectionSource.getSQLDialectCode()); if (getGeneratedKeysMethod() != null) { @@ -71,7 +73,7 @@ /** * @param connectionSource - * The connectionSource to set. + * The connectionSource to set. */ public void setConnectionSource(ConnectionSource connectionSource) { this.connectionSource = connectionSource; @@ -83,10 +85,13 @@ try { connection = connectionSource.getConnection(); connection.setAutoCommit(false); - - PreparedStatement insertStatement = connection - .prepareStatement(getInsertSQL()); - + PreparedStatement insertStatement; + if (cnxSupportsGetGeneratedKeys) { + insertStatement = connection.prepareStatement(getInsertSQL(), + new String[] {"EVENT_ID"}); + } else { + insertStatement = connection.prepareStatement(getInsertSQL()); + } subAppend(eventObject, connection, insertStatement); // we no longer need the insertStatement @@ -94,7 +99,6 @@ insertStatement.close(); insertStatement = null; } - connection.commit(); } catch (Throwable sqle) { addError("problem appending event", sqle); @@ -106,7 +110,7 @@ protected abstract void subAppend(Object eventObject, Connection connection, PreparedStatement statement) throws Throwable; - protected int getEventId(PreparedStatement insertStatement, + protected int selectEventId(PreparedStatement insertStatement, Connection connection) throws SQLException, InvocationTargetException { ResultSet rs = null; Statement idStatement = null; @@ -139,8 +143,7 @@ } // A ResultSet cursor is initially positioned before the first row; - // the - // first call to the method next makes the first row the current row + // the first call to the method next makes the first row the current row rs.next(); int eventId = rs.getInt(1); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DataSourceConnectionSource.java Wed Oct 22 22:50:47 2008 @@ -15,6 +15,8 @@ import javax.sql.DataSource; +import ch.qos.logback.core.db.dialect.SQLDialectCode; + /** * The DataSourceConnectionSource is an implementation of * {@link ConnectionSource} that obtains the Connection in the recommended JDBC @@ -47,7 +49,7 @@ discoverConnnectionProperties(); } if (!supportsGetGeneratedKeys() - && getSQLDialectCode() == ConnectionSource.UNKNOWN_DIALECT) { + && getSQLDialectCode() == SQLDialectCode.UNKNOWN_DIALECT) { addWarn("Connection does not support GetGeneratedKey method and could not discover the dialect."); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java Wed Oct 22 22:50:47 2008 @@ -12,7 +12,6 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; -import ch.qos.logback.core.db.ConnectionSource; import ch.qos.logback.core.spi.ContextAwareBase; /** @@ -28,25 +27,25 @@ private static final String MSSQL_PART = "microsoft"; private static final String HSQL_PART = "hsql"; - public static int discoverSQLDialect(DatabaseMetaData meta) { - int dialectCode = 0; + public static SQLDialectCode discoverSQLDialect(DatabaseMetaData meta) { + SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT; try { String dbName = meta.getDatabaseProductName().toLowerCase(); if (dbName.indexOf(POSTGRES_PART) != -1) { - return ConnectionSource.POSTGRES_DIALECT; + return SQLDialectCode.POSTGRES_DIALECT; } else if (dbName.indexOf(MYSQL_PART) != -1) { - return ConnectionSource.MYSQL_DIALECT; + return SQLDialectCode.MYSQL_DIALECT; } else if (dbName.indexOf(ORACLE_PART) != -1) { - return ConnectionSource.ORACLE_DIALECT; + return SQLDialectCode.ORACLE_DIALECT; } else if (dbName.indexOf(MSSQL_PART) != -1) { - return ConnectionSource.MSSQL_DIALECT; + return SQLDialectCode.MSSQL_DIALECT; } else if (dbName.indexOf(HSQL_PART) != -1) { - return ConnectionSource.HSQL_DIALECT; + return SQLDialectCode.HSQL_DIALECT; } else { - return ConnectionSource.UNKNOWN_DIALECT; + return SQLDialectCode.UNKNOWN_DIALECT; } } catch (SQLException sqle) { // we can't do much here @@ -55,27 +54,27 @@ return dialectCode; } - public static SQLDialect getDialectFromCode(int dialectCode) { + public static SQLDialect getDialectFromCode(SQLDialectCode sqlDialectType) { SQLDialect sqlDialect = null; - switch (dialectCode) { - case ConnectionSource.POSTGRES_DIALECT: + switch (sqlDialectType) { + case POSTGRES_DIALECT: sqlDialect = new PostgreSQLDialect(); break; - case ConnectionSource.MYSQL_DIALECT: + case MYSQL_DIALECT: sqlDialect = new MySQLDialect(); break; - case ConnectionSource.ORACLE_DIALECT: + case ORACLE_DIALECT: sqlDialect = new OracleDialect(); break; - case ConnectionSource.MSSQL_DIALECT: + case MSSQL_DIALECT: sqlDialect = new MsSQLDialect(); break; - case ConnectionSource.HSQL_DIALECT: + case HSQL_DIALECT: sqlDialect = new HSQLDBDialect(); break; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/HSQLDBDialect.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/HSQLDBDialect.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/HSQLDBDialect.java Wed Oct 22 22:50:47 2008 @@ -7,17 +7,18 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.core.db.dialect; +package ch.qos.logback.core.db.dialect; -/** - * The HSQLDB dialect. +/** + * The HSQLDB dialect. * * @author Ceki Gülcü -*/ -public class HSQLDBDialect implements SQLDialect { - public static final String SELECT_CURRVAL = "CALL IDENTITY()"; + */ +public class HSQLDBDialect implements SQLDialect { + public static final String SELECT_CURRVAL = "CALL IDENTITY()"; - public String getSelectInsertId() { - return SELECT_CURRVAL; - } + public String getSelectInsertId() { + return SELECT_CURRVAL; + } + } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialect.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialect.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialect.java Wed Oct 22 22:50:47 2008 @@ -10,11 +10,9 @@ package ch.qos.logback.core.db.dialect; /** - * @author ceki + * @author Ceki Gücü * */ public interface SQLDialect { - public String getSelectInsertId(); - } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java Wed Oct 22 22:50:47 2008 @@ -0,0 +1,10 @@ +package ch.qos.logback.core.db.dialect; + +public enum SQLDialectCode { + UNKNOWN_DIALECT, + POSTGRES_DIALECT, + MYSQL_DIALECT, + ORACLE_DIALECT, + MSSQL_DIALECT, + HSQL_DIALECT; +} Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Wed Oct 22 22:50:47 2008 @@ -101,5 +101,4 @@ </plugin> </plugins> </build> - </project> \ No newline at end of file Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Wed Oct 22 22:50:47 2008 @@ -2299,8 +2299,9 @@ </p> - <a name="DBAppender"></a> - <h3>DBAppender</h3> + <h3> + <a name="DBAppender" href="#DBAppender">DBAppender</a> + </h3> <p>The <a href="../xref/ch/qos/logback/classic/db/DBAppender.html"><code>DBAppender</code></a> @@ -2322,79 +2323,88 @@ to us, we will gladly include missing scripts in future releases. </p> - <p> - If your JDBC driver supports the - <code>getGeneratedKeys</code> method introduced in - JDBC 3.0 specification, then no more steps are required, excluding usual - configuration. - </p> - <p> - Otherwise, there must be an <code>SQLDialect</code> appropriate for your - database system. Currently, we have dialects for PostgreSQL, - MySQL, Oracle and MsSQL. As mentioned previously, an - <code>SQLDialect</code> is required only if the JDBC driver for your - database system does not support the <code>getGeneratedKeys</code> - method. + <p>If your JDBC driver supports the <code>getGeneratedKeys</code> + method introduced in JDBC 3.0 specification, assuming you have + created the appropriate database tables as mentioned above, then + no more steps are required, excluding usual logback configuration. </p> - <p> - The table below summarizes the database types and their support of the - <code>getGeneratedKeys()</code> method. + <p>Otherwise, there must be an <code>SQLDialect</code> appropriate + for your database system. Currently, we have dialects for + PostgreSQL, MySQL, Oracle and MS SQL Server. </p> + + <p>The table below summarizes the database types and their support + of the <code>getGeneratedKeys()</code> method. </p> <table class="bodyTable" border="1" cellpadding="4"> <tr class="a"> <th>RDBMS</th> - <th> + <th>tested version(s) + </th> + <th>tested JDBC driver version(s) + </th> + <th> supports <br /> <code>getGeneratedKeys()</code> method - </th> - <th> - specific - <br /> - SQLDialect support - </th> + </th> </tr> - <tr class="b"> - <td>PostgreSQL</td> - <td>NO</td> - <td>present and used</td> - </tr> - <tr class="a"> - <td>MySQL</td> - <td>YES</td> - <td>present, but not actually needed or used</td> + + <tr > + <td>DB2</td> + <td>untested</td> + <td>untested</td> + <td>unknown</td> </tr> - <tr class="b"> - <td>Oracle</td> - <td>YES</td> - <td>present, but not actually needed or used</td> + + <tr class="alt"> + <td>HSQL</td> + <td>1.8.0.7</td> + <td>-</td> + <td>NO</td> </tr> - <tr class="a"> - <td>DB2</td> + + <tr > + <td>Microsoft SQL Server</td> + <td>2005</td> + <td>2.0.1008.2 (sqljdbc.jar)</td> <td>YES</td> - <td>not present, and not needed or used</td> </tr> - <tr class="b"> - <td>MsSQL</td> + + <tr class="alt"> + <td>MySQL</td> + <td>5.0.22</td> + <td>5.0.8 (mysql-connector.jar)</td> <td>YES</td> - <td>not present, and not needed or used</td> </tr> - <tr class="a"> - <td>HSQL</td> + + <tr> + <td>PostgreSQL</td> + <td> + </td> + <td> + </td> <td>NO</td> - <td>present and used</td> </tr> + + <tr > + <td>Oracle</td> + <td>10g</td> + <td>10.2.0.1 (ojdbc14.jar)</td> + <td>YES (10.2.0.1)</td> + </tr> + + + </table> - <p> - Experiments show that writing a single event - into the database takes approximately 10 milliseconds, on a - "standard" PC. If pooled connections are used, this figure - drops to around 1 milliseconds. Note that most JDBC drivers - already ship with connection pooling support. + <p>Experiments show that writing a single event into the database + takes approximately 10 milliseconds, on a "standard" PC. If pooled + connections are used, this figure drops to around 1 + milliseconds. Note that most JDBC drivers already ship with + connection pooling support. </p> <p>

3 2

svn commit: r1875 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 27 Oct '08

27 Oct '08

Author: ceki Date: Mon Oct 27 13:15:05 2008 New Revision: 1875 Modified: logback/trunk/logback-site/src/site/pages/manual/mdc.html Log: - minor rewording in the docs Modified: logback/trunk/logback-site/src/site/pages/manual/mdc.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/mdc.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/mdc.html Mon Oct 27 13:15:05 2008 @@ -51,10 +51,11 @@ </p> <p>To uniquely stamp each request, the user puts contextual - information into the <code><a - href="http://www.slf4j.org/api/org/slf4j/MDC.html">MDC</a></code>, - the abbreviation of Mapped Diagnostic Context. The salient parts - of the MDC class is shown below. + information into the <code>MDC</code>, the abbreviation of Mapped + Diagnostic Context. The salient parts of the MDC class are shown + below. Please refer to the <a + href="http://www.slf4j.org/api/org/slf4j/MDC.html">MDC + javadocs</a> for a complete list of methods. </p> <div class="source"><pre>package org.slf4j; @@ -75,18 +76,17 @@ }</pre></div> <p>The <code>MDC</code> class contains only static methods. It - lets the developer place information in a <em>diagnostic - context</em> that can be subsequently retrieved by certain - logback components. The <code>MDC</code> manages contextual - information on a <em>per thread basis</em>. A child thread * - automatically inherits a <em>copy</em> of the mapped diagnostic - context of * its parent. Typically, while starting to service a - new client request, the developer will insert pertinent - contextual information, such as the client id, client's IP - address, request parameters etc. into the - <code>MDC</code>. Logback components, if appropriately - configured, will automatically include this information in each - log entry. + lets the developer place information in a <em>diagnostic + context</em> that can be subsequently retrieved by certain logback + components. The <code>MDC</code> manages contextual information on + a <em>per thread basis</em>. A child thread automatically + inherits a <em>copy</em> of the mapped diagnostic context of its + parent. Typically, while starting to service a new client request, + the developer will insert pertinent contextual information, such + as the client id, client's IP address, request parameters + etc. into the <code>MDC</code>. Logback components, if + appropriately configured, will automatically include this + information in each log entry. </p> <p>

1 0

[JIRA] Resolved: (LBSITE-13) Logback manual refers to a not existing function in org.slf4j.MDC
by Ceki Gulcu (JIRA) 27 Oct '08

27 Oct '08

[ http://jira.qos.ch/browse/LBSITE-13?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBSITE-13. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed Resolved in revision 1777 > Logback manual refers to a not existing function in org.slf4j.MDC > ----------------------------------------------------------------- > > Key: LBSITE-13 > URL: http://jira.qos.ch/browse/LBSITE-13 > Project: logback-site > Issue Type: Bug > Components: Documentation > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Michael Franz > Assignee: Logback dev list > Fix For: 0.9.10 > > > The logback manual chapter 7 says: > package org.slf4j; > public class MDC { > ... > //Returns the keys in the MDC as a Set. The returned value can be null. > public static Set<String> getKeys(); > } > But the method getKeys() is not part of the released slf4j API (versions 1.4.3 and 1.5.0). > This method exists only within the LogbackMDCAdapter. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[JIRA] Resolved: (LBCORE-31) "Watching" the config file
by Ceki Gulcu (JIRA) 27 Oct '08

27 Oct '08

[ http://jira.qos.ch/browse/LBCORE-31?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-31. ------------------------------ Resolution: Duplicate > "Watching" the config file > -------------------------- > > Key: LBCORE-31 > URL: http://jira.qos.ch/browse/LBCORE-31 > Project: logback-core > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Ted Graham > Assignee: Logback dev list > > I build server applications and when something goes wrong, I need to be able to enable logging and have the application notice the change without a restart. My application have no gui, so manually "poking" the application is awkward and ugly. > Note that I disagree with the suggestion to check if the file has changed on each log statement. My application's performance goals are measured in microseconds (time to respond to a message by sending another message), any additional latency is a big problem for me. I'd like to be able to configure the frequency of checking the file, but it isn't super important. > Ideally, I'd like to be able to specify that the config file should be watched IN the config file, rather than programatically. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

svn commit: r1868 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi
by noreply.ceki＠qos.ch 27 Oct '08

27 Oct '08

Author: ceki Date: Thu Oct 23 22:02:53 2008 New Revision: 1868 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Log: LBCORE-63 Using ReadWriteLock with the hope of improving performance. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Thu Oct 23 22:02:53 2008 @@ -9,8 +9,12 @@ */ package ch.qos.logback.core.spi; +import java.util.ArrayList; import java.util.Iterator; -import java.util.concurrent.CopyOnWriteArrayList; +import java.util.List; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import ch.qos.logback.core.Appender; @@ -21,7 +25,10 @@ */ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { - final private CopyOnWriteArrayList<Appender<E>> appenderList = new CopyOnWriteArrayList<Appender<E>>(); + final private List<Appender<E>> appenderList = new ArrayList<Appender<E>>(); + final private ReadWriteLock rwLock = new ReentrantReadWriteLock(); + private final Lock r = rwLock.readLock(); + private final Lock w = rwLock.writeLock(); /** * Attach an appender. If the appender is already in the list in won't be @@ -31,7 +38,12 @@ if (newAppender == null) { throw new IllegalArgumentException("Null argument disallowed"); } - appenderList.addIfAbsent(newAppender); + w.lock(); + if (!appenderList.contains(newAppender)) { + appenderList.add(newAppender); + } + w.unlock(); + } /** @@ -39,9 +51,14 @@ */ public int appendLoopOnAppenders(E e) { int size = 0; - for (Appender<E> appender : appenderList) { - appender.doAppend(e); - size++; + r.lock(); + try { + for (Appender<E> appender : appenderList) { + appender.doAppend(e); + size++; + } + } finally { + r.unlock(); } return size; } @@ -53,7 +70,11 @@ * @return Iterator An iterator of attached appenders. */ public Iterator<Appender<E>> iteratorForAppenders() { - return appenderList.iterator(); + List<Appender<E>> copy; + r.lock(); + copy = new ArrayList<Appender<E>>(appenderList); + r.unlock(); + return copy.iterator(); } /** @@ -67,11 +88,15 @@ if (name == null) { return null; } + r.lock(); + for (Appender<E> appender : appenderList) { if (name.equals(appender.getName())) { + r.unlock(); return appender; } } + r.unlock(); return null; } @@ -85,11 +110,14 @@ if (appender == null) { return false; } + r.lock(); for (Appender<E> a : appenderList) { if (a == appender) { + r.unlock(); return true; } } + r.unlock(); return false; } @@ -97,10 +125,15 @@ * Remove and stop all previously attached appenders. */ public void detachAndStopAllAppenders() { - for (Appender<E> a : appenderList) { - a.stop(); - } + try { + w.lock(); + for (Appender<E> a : appenderList) { + a.stop(); + } appenderList.clear(); + } finally { + w.unlock(); + } } /** @@ -111,7 +144,10 @@ if (appender == null) { return false; } - return appenderList.remove(appender); + w.lock(); + boolean result = appenderList.remove(appender); + w.unlock(); + return result; } /** @@ -122,11 +158,14 @@ if (name == null) { return false; } + w.lock(); for (Appender<E> a : appenderList) { if (name.equals((a).getName())) { + w.unlock(); return appenderList.remove(a); } } + w.unlock(); return false; } }

2 1

svn commit: r1874 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db
by noreply.ceki＠qos.ch 24 Oct '08

24 Oct '08

Author: ceki Date: Fri Oct 24 23:24:53 2008 New Revision: 1874 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java - copied, changed from r1859, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java Removed: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java Modified: 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/PackageTest.java Log: - renamed DBAppenderTestBase DBAppenderTestInfrastructure Modified: 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/DBAppenderTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java Fri Oct 24 23:24:53 2008 @@ -12,7 +12,7 @@ import ch.qos.logback.core.db.DriverManagerConnectionSource; import ch.qos.logback.core.util.StatusPrinter; -public class DBAppenderTest extends DBAppenderTestBase { +public class DBAppenderTest extends DBAppenderTestInfrastructure { AccessContext context; DBAppender appender; Copied: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java (from r1859, /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/DBAppenderTestBase.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java Fri Oct 24 23:24:53 2008 @@ -9,7 +9,7 @@ import org.hsqldb.Server; -public abstract class DBAppenderTestBase extends TestCase { +public abstract class DBAppenderTestInfrastructure extends TestCase { public static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; String serverProps; @@ -19,7 +19,7 @@ Server server; boolean isNetwork = true; - public DBAppenderTestBase(String name) { + public DBAppenderTestInfrastructure(String name) { super(name); } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Fri Oct 24 23:24:53 2008 @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(DBAppenderTest.class); + suite.addTest(new JUnit4TestAdapter(DBAppenderIntegrationTest.class)); return suite; } } \ No newline at end of file

1 0

svn commit: r1873 - in logback/trunk/logback-access: . src/main/java/ch/qos/logback/access/db/dialect src/test/input src/test/input/integration src/test/input/integration/db src/test/java/ch/qos/logback/access/db
by noreply.ceki＠qos.ch 24 Oct '08

24 Oct '08

Author: ceki Date: Fri Oct 24 23:22:21 2008 New Revision: 1873 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/msSQLServer.sql - copied, changed from r1859, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mssql.sql logback/trunk/logback-access/src/test/input/ logback/trunk/logback-access/src/test/input/integration/ logback/trunk/logback-access/src/test/input/integration/db/ logback/trunk/logback-access/src/test/input/integration/db/mysql-with-driver.xml logback/trunk/logback-access/src/test/input/integration/db/oracle10g-with-driver.xml logback/trunk/logback-access/src/test/input/integration/db/oracle11g-with-driver.xml logback/trunk/logback-access/src/test/input/integration/db/postgresql-with-driver.xml logback/trunk/logback-access/src/test/input/integration/db/sqlserver-with-driver.xml logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java Removed: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mssql.sql Modified: logback/trunk/logback-access/pom.xml Log: Related to LBCORE-15 - doing integration tests with various databases for logback-access Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Fri Oct 24 23:22:21 2008 @@ -1,4 +1,6 @@ -<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> @@ -21,7 +23,8 @@ a line return in the description. The generated jar will contain a corrupt MANIFEST file. --> - Logback: the generic, reliable, fast and flexible logging library for Java. + Logback: the generic, reliable, fast and flexible logging + library for Java. </description> <licenses> <license> @@ -48,28 +51,28 @@ <groupId>tomcat</groupId> <artifactId>catalina</artifactId> <scope>compile</scope> - <optional>true</optional> + <optional>true</optional> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <scope>compile</scope> - <optional>true</optional> + <optional>true</optional> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> <scope>compile</scope> - <optional>true</optional> + <optional>true</optional> </dependency> <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> <scope>compile</scope> - <optional>true</optional> + <optional>true</optional> </dependency> <dependency> @@ -77,14 +80,14 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <scope>compile</scope> - <optional>true</optional> + <optional>true</optional> </dependency> - + </dependencies> <build> @@ -103,9 +106,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <fork>once</fork> - <reportFormat>plain</reportFormat> - <disableXmlReport>true</disableXmlReport> + <fork>once</fork> + <reportFormat>plain</reportFormat> + <disableXmlReport>true</disableXmlReport> <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> @@ -129,7 +132,47 @@ </executions> </plugin> </plugins> - </build> + + + <profiles> + <profile> +  + <id>host-orion</id> + + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-507.jdbc3</version> + </dependency> + +  + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>sqljdbc</artifactId> + <version>2.0</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + </profile> + + </profiles> + </project> \ No newline at end of file Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/msSQLServer.sql (from r1859, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mssql.sql) ============================================================================== --- /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/mssql.sql (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/msSQLServer.sql Fri Oct 24 23:22:21 2008 @@ -4,7 +4,7 @@ DROP TABLE access_event_header DROP TABLE access_event -CREATE TABLE logging_event +CREATE TABLE access_event ( timestmp BIGINT NOT NULL, requestURI VARCHAR(254), Added: logback/trunk/logback-access/src/test/input/integration/db/mysql-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/input/integration/db/mysql-with-driver.xml Fri Oct 24 23:22:21 2008 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.access.db.DBAppender"> + <connectionSource + class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>com.mysql.jdbc.Driver</driverClass> + <url>jdbc:mysql://localhost:3306/logback</url> + <user>root</user> + <password></password> + </connectionSource> + </appender> + + + <appender-ref ref="DB" /> +</configuration> Added: logback/trunk/logback-access/src/test/input/integration/db/oracle10g-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/input/integration/db/oracle10g-with-driver.xml Fri Oct 24 23:22:21 2008 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.access.db.DBAppender"> + <connectionSource + class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>oracle.jdbc.OracleDriver</driverClass> + <url>jdbc:oracle:thin:@localhost:1522:xe</url> + <user>hr</user> + <password>hr</password> + </connectionSource> + </appender> + + + <appender-ref ref="DB" /> +</configuration> Added: logback/trunk/logback-access/src/test/input/integration/db/oracle11g-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/input/integration/db/oracle11g-with-driver.xml Fri Oct 24 23:22:21 2008 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.access.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>oracle.jdbc.OracleDriver</driverClass> + <url>jdbc:oracle:thin:@localhost:1521:orcl</url> + <user>SCOTT</user> + <password>SCOTT</password> + </connectionSource> + </appender> + + + <appender-ref ref="DB" /> + +</configuration> Added: logback/trunk/logback-access/src/test/input/integration/db/postgresql-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/input/integration/db/postgresql-with-driver.xml Fri Oct 24 23:22:21 2008 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.access.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>org.postgresql.Driver</driverClass> + <url>jdbc:postgresql://192.168.1.5:5432/test</url> + <user>logback</user> + <password>logback</password> + </connectionSource> + </appender> + + <appender-ref ref="DB" /> + +</configuration> Added: logback/trunk/logback-access/src/test/input/integration/db/sqlserver-with-driver.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/input/integration/db/sqlserver-with-driver.xml Fri Oct 24 23:22:21 2008 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="DB" class="ch.qos.logback.access.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>com.microsoft.sqlserver.jdbc.SQLServerDriver</driverClass> + <url>jdbc:sqlserver://localhost:1987;databaseName=logback;</url> + <user>logback</user> + <password>logback</password> + </connectionSource> + </appender> + + + <appender-ref ref="DB" /> +</configuration> Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java Fri Oct 24 23:22:21 2008 @@ -0,0 +1,136 @@ +package ch.qos.logback.access.db; + +import static org.junit.Assert.assertEquals; + +import java.net.InetAddress; +import java.util.Random; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +import ch.qos.logback.access.dummy.DummyRequest; +import ch.qos.logback.access.dummy.DummyResponse; +import ch.qos.logback.access.dummy.DummyServerAdapter; +import ch.qos.logback.access.joran.JoranConfigurator; +import ch.qos.logback.access.spi.AccessContext; +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.util.StatusPrinter; + +public class DBAppenderIntegrationTest { + + static String LOCAL_HOST_NAME; + static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; + + int diff = new Random(System.nanoTime()).nextInt(10000); + AccessContext context = new AccessContext(); + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + InetAddress localhostIA = InetAddress.getLocalHost(); + LOCAL_HOST_NAME = localhostIA.getHostName(); + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + + } + + public void doTest(String configFile) throws JoranException { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(context); + configurator.doConfigure(configFile); + + Appender<AccessEvent> appender = context.getAppender("DB"); + + for (int i = 0; i < 10; i++) { + AccessEvent event = createAccessEvent(); + appender.doAppend(event); + } + + StatusPrinter.print(context); + + // check that there were no errors + assertEquals(Status.INFO, context.getStatusManager().getLevel()); + + } + + static boolean isConformingHost() { + for (String conformingHost : CONFORMING_HOST_LIST) { + if (conformingHost.equalsIgnoreCase(LOCAL_HOST_NAME)) { + return true; + } + } + return false; + } + + @Test + public void sqlserver() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/sqlserver-with-driver.xml"); + } + + @Test + public void oracle10g() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/oracle10g-with-driver.xml"); + } + + @Test + @Ignore + public void oracle11g() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/oracle11g-with-driver.xml"); + } + + @Test + public void mysql() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/mysql-with-driver.xml"); + } + + @Test + public void postgres() throws Exception { + // perform test only on conforming hosts + if (!isConformingHost()) { + return; + } + doTest("src/test/input/integration/db/postgresql-with-driver.xml"); + } + + 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; + } + +}

1 0

svn commit: r1872 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect
by noreply.ceki＠qos.ch 24 Oct '08

24 Oct '08

Author: ceki Date: Fri Oct 24 23:20:35 2008 New Revision: 1872 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/oracle.sql Log: comment on the TRIGGER creation Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/oracle.sql ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/oracle.sql (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/oracle.sql Fri Oct 24 23:20:35 2008 @@ -5,6 +5,7 @@ CREATE SEQUENCE access_event_id_seq MINVALUE 1 START WITH 1; + CREATE TABLE access_event ( timestmp NUMBER(20) NOT NULL, @@ -20,6 +21,10 @@ event_id NUMBER(10) PRIMARY KEY ); +-- the / suffix may or may not be needed depending on your SQL Client +-- Some SQL Clients, e.g. SQuirrel SQL has trouble with the following +-- trigger creation command, while SQLPlus (the basic SQL Client which +-- ships with Oracle) has no trouble at all. CREATE TRIGGER access_event_id_seq_trig BEFORE INSERT ON access_event @@ -29,7 +34,7 @@ INTO :NEW.event_id FROM DUAL; END access_event_id_seq_trig; - +/ CREATE TABLE access_event_header (

1 0