- logback-dev - mailman3.qos.ch

[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

svn commit: r1871 - 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:19:44 2008 New Revision: 1871 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/db/dialect/oracle.sql Log: Use NUMBER(10) instead of BIGINT for the timestamp field 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:19:44 2008 @@ -7,7 +7,7 @@ CREATE TABLE access_event ( - timestmp BIGINT NOT NULL, + timestmp NUMBER(20) NOT NULL, requestURI VARCHAR(254), requestURL VARCHAR(254), remoteHost VARCHAR(254),

1 0

svn commit: r1870 - logback/trunk
by noreply.ceki＠qos.ch 24 Oct '08

24 Oct '08

Author: ceki Date: Fri Oct 24 22:41:55 2008 New Revision: 1870 Modified: logback/trunk/pom.xml Log: a released version of SLF4J is all we need Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Fri Oct 24 22:41:55 2008 @@ -36,7 +36,7 @@ <properties>  - <slf4j.version>1.5.6-SNAPSHOT</slf4j.version> + <slf4j.version>1.5.5</slf4j.version> <slf4j.ext.version>1.0-alpha0</slf4j.ext.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties>

1 0

svn commit: r1869 - in logback/trunk: logback-classic/src/test/java/ch/qos/logback/classic logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/testUtil
by noreply.ceki＠qos.ch 23 Oct '08

23 Oct '08

Author: ceki Date: Fri Oct 24 00:46:40 2008 New Revision: 1869 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/testUtil/ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Log: - Verified that the problem is JIT related on Linux. (Turning of the JIT causes the tests to pass). Disabling the failing testDurationOfEnabledLog test on Linux. Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Fri Oct 24 00:46:40 2008 @@ -19,6 +19,7 @@ import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.appender.NOPAppender; +import ch.qos.logback.core.testUtil.Env; public class LoggerPerfTest { @@ -80,10 +81,13 @@ @Test public void testDurationOfEnabledLog() { + if(Env.isLinux()) { + // the JIT on Linux behaves very differently + return; + } computeDurationOfEnabledLog(SHORTENED_RUN_LENGTH); double avgDuration = computeDurationOfEnabledLog(SHORTENED_RUN_LENGTH); long referencePerf = 500; - System.out.println("avgDuration="+avgDuration); BogoPerf.assertDuration(avgDuration, referencePerf, REFERENCE_BIPS); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Fri Oct 24 00:46:40 2008 @@ -16,7 +16,8 @@ package ch.qos.logback.core.rolling; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; @@ -24,11 +25,11 @@ import org.junit.Before; import org.junit.Test; - import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.Layout; import ch.qos.logback.core.layout.DummyLayout; +import ch.qos.logback.core.testUtil.Env; import ch.qos.logback.core.util.Compare; import ch.qos.logback.core.util.Constants; @@ -156,7 +157,7 @@ // The File.length() method is not accurate under Windows - if (!isWindows()) { + if (!Env.isWindows()) { assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.log", Constants.TEST_DIR_PREFIX @@ -224,7 +225,7 @@ assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.1.gz") .exists()); - if (!isWindows()) { + if (!Env.isWindows()) { assertTrue(Compare.compare( Constants.OUTPUT_DIR_PREFIX+"sbr-test3.log", @@ -240,7 +241,5 @@ // StatusPrinter.print(context.getStatusManager()); } - boolean isWindows() { - return System.getProperty("os.name").indexOf("Windows") != -1; - } + } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java Fri Oct 24 00:46:40 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 ch.qos.logback.core.testUtil; + +public class Env { + + static public boolean isWindows() { + return System.getProperty("os.name").indexOf("Windows") != -1; + } + + static public boolean isLinux() { + return System.getProperty("os.name").indexOf("Linux") != -1; + } +}

1 0

svn commit: r1867 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 23 Oct '08

23 Oct '08

Author: ceki Date: Thu Oct 23 20:45:29 2008 New Revision: 1867 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Log: tweaking Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java Thu Oct 23 20:45:29 2008 @@ -19,14 +19,13 @@ import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.appender.NOPAppender; -import ch.qos.logback.core.util.StatusPrinter; public class LoggerPerfTest { long NANOS_IN_ONE_SEC = 1000*1000*1000L; static long NORMAL_RUN_LENGTH = 1000 * 1000; - static long SHORTENED_RUN_LENGTH = 1000 * 1000; - static long REFERENCE_BIPS = 9324; + static long SHORTENED_RUN_LENGTH = 500 * 1000; + static long REFERENCE_BIPS = 9000; @Before public void setUp() throws Exception { @@ -96,15 +95,13 @@ nopAppender.start(); logger.addAppender(nopAppender); for (long i = 0; i < len; i++) { - logger.debug("Toto", i); + logger.debug("Toto"); } long start = System.nanoTime(); for (long i = 0; i < len; i++) { logger.debug("Toto"); } long end = System.nanoTime(); - StatusPrinter.print(lc); - return (end - start) / len; }

2 1