- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-112-g16e8cfb
by git-noreply＠pixie.qos.ch 23 Mar '10

23 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 16e8cfbd6a3a9cb96a883270907792400790dc49 (commit) from 8d16d5325738f9816f3a191208ccf54cbeaffd3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=16e8cfbd6a3a9cb96a883270… http://github.com/ceki/logback/commit/16e8cfbd6a3a9cb96a883270907792400790d… commit 16e8cfbd6a3a9cb96a883270907792400790dc49 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 23 18:47:06 2010 +0100 - tests run on oracle (host=hora) diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 477d694..b52f8f1 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -314,7 +314,6 @@ org.slf4j.test_osgi <profile>  <id>host-orion</id> - <dependencies>  <dependency> @@ -334,6 +333,19 @@ org.slf4j.test_osgi </profile> + <profile> +  + <id>host-hora</id> + <dependencies> +  + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.1</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql index e670866..9ac0b79 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql @@ -13,11 +13,11 @@ CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START WITH 1; - +CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START WITH 1; CREATE TABLE logging_event ( timestmp NUMBER(20) NOT NULL, - formatted_message VARCHAR2(4000) NOT NULL, + formatted_message VARCHAR2(4000) NOT NULL, logger_name VARCHAR(254) NOT NULL, level_string VARCHAR(254) NOT NULL, thread_name VARCHAR(254), diff --git a/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml b/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml index 0f601fd..17f9a75 100644 --- a/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml +++ b/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml @@ -2,17 +2,17 @@ <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> + <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:xe</url> + <user>test</user> + <password>test</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> </configuration> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java index 341d135..ce0d3da 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java @@ -40,7 +40,8 @@ public class DBAppenderIntegrationTest { static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; static String[] POSTGRES_CONFORMING_HOST_LIST = new String[] { "haro" }; static String[] MYSQL_CONFORMING_HOST_LIST = new String[] { "haro" }; - + static String[] ORACLE_CONFORMING_HOST_LIST = new String[] { "haro" }; + int diff = new Random(System.nanoTime()).nextInt(10000); LoggerContext lc = new LoggerContext(); @@ -117,10 +118,9 @@ public class DBAppenderIntegrationTest { } @Test - @Ignore public void oracle10g() throws Exception { // perform test only on conforming hosts - if (!isConformingHostAndJDK16OrHigher()) { + if (!isConformingHostAndJDK16OrHigher(ORACLE_CONFORMING_HOST_LIST)) { return; } doTest("src/test/input/integration/db/oracle10g-with-driver.xml"); ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 14 ++++++++++- .../ch/qos/logback/classic/db/dialect/oracle.sql | 4 +- .../input/integration/db/oracle10g-with-driver.xml | 26 ++++++++++---------- .../classic/db/DBAppenderIntegrationTest.java | 6 ++-- 4 files changed, 31 insertions(+), 19 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-111-g8d16d53
by git-noreply＠pixie.qos.ch 23 Mar '10

23 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 8d16d5325738f9816f3a191208ccf54cbeaffd3f (commit) from e6af6bd2f69de46eed5febf9bb0de8613469a713 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8d16d5325738f9816f3a1912… http://github.com/ceki/logback/commit/8d16d5325738f9816f3a191208ccf54cbeaff… commit 8d16d5325738f9816f3a191208ccf54cbeaffd3f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 23 16:16:47 2010 +0100 - DBAppender tests pass with MySQL diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 9db2104..477d694 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -94,6 +94,13 @@ </dependency> <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.9</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <scope>compile</scope> @@ -309,13 +316,6 @@ org.slf4j.test_osgi <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>com.microsoft.sqlserver</groupId> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/mysql.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/mysql.sql index bc9dabe..e8c2fb3 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/mysql.sql +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/mysql.sql @@ -1,51 +1,51 @@ # This SQL script creates the required tables by ch.qos.logback.classic.db.DBAppender. # -# It is intended for MySQL databases. It has been tested on MySQL 5.0.22 with -# INNODB tables. +# It is intended for MySQL databases. It has been tested on MySQL 5.1.37 +# on Linux BEGIN; -DROP TABLE IF EXISTS logging_event_property; -DROP TABLE IF EXISTS logging_event_exception; -DROP TABLE IF EXISTS logging_event; +DROP TABLE IF EXISTS LOGGING_EVENT_PROPERTY; +DROP TABLE IF EXISTS LOGGING_EVENT_EXCEPTION; +DROP TABLE IF EXISTS LOGGING_EVENT; COMMIT; BEGIN; -CREATE TABLE logging_event +CREATE TABLE LOGGING_EVENT ( - timestmp BIGINT NOT NULL, - formatted_message TEXT NOT NULL, - logger_name VARCHAR(254) NOT NULL, - level_string VARCHAR(254) NOT NULL, - thread_name VARCHAR(254), - reference_flag SMALLINT, - caller_filename VARCHAR(254) NOT NULL, - caller_class VARCHAR(254) NOT NULL, - caller_method VARCHAR(254) NOT NULL, - caller_line CHAR(4) NOT NULL, - event_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY + TIMESTMP BIGINT NOT NULL, + FORMATTED_MESSAGE TEXT NOT NULL, + LOGGER_NAME VARCHAR(254) NOT NULL, + LEVEL_STRING VARCHAR(254) NOT NULL, + THREAD_NAME VARCHAR(254), + REFERENCE_FLAG SMALLINT, + CALLER_FILENAME VARCHAR(254) NOT NULL, + CALLER_CLASS VARCHAR(254) NOT NULL, + CALLER_METHOD VARCHAR(254) NOT NULL, + CALLER_LINE CHAR(4) NOT NULL, + EVENT_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY ); COMMIT; BEGIN; -CREATE TABLE logging_event_property +CREATE TABLE LOGGING_EVENT_PROPERTY ( - event_id INT NOT NULL, - mapped_key VARCHAR(254) NOT NULL, - mapped_value TEXT, - PRIMARY KEY(event_id, mapped_key), - FOREIGN KEY (event_id) REFERENCES logging_event(event_id) + EVENT_ID INT NOT NULL, + MAPPED_KEY VARCHAR(254) NOT NULL, + MAPPED_VALUE TEXT, + PRIMARY KEY(EVENT_ID, MAPPED_KEY), + FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID) ); COMMIT; BEGIN; -CREATE TABLE logging_event_exception +CREATE TABLE LOGGING_EVENT_EXCEPTION ( - event_id INT NOT NULL, - i SMALLINT NOT NULL, - trace_line VARCHAR(254) NOT NULL, - PRIMARY KEY(event_id, i), - FOREIGN KEY (event_id) REFERENCES logging_event(event_id) + EVENT_ID INT NOT NULL, + I SMALLINT NOT NULL, + TRACE_LINE VARCHAR(254) NOT NULL, + PRIMARY KEY(EVENT_ID, I), + FOREIGN KEY (EVENT_ID) REFERENCES LOGGING_EVENT(EVENT_ID) ); COMMIT; \ No newline at end of file diff --git a/logback-classic/src/test/input/integration/db/mysql-with-driver.xml b/logback-classic/src/test/input/integration/db/mysql-with-driver.xml index 1f42bac..557554f 100644 --- a/logback-classic/src/test/input/integration/db/mysql-with-driver.xml +++ b/logback-classic/src/test/input/integration/db/mysql-with-driver.xml @@ -2,17 +2,17 @@ <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> + <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://127.0.0.1:3306/test</url> + <user>test</user> + <password>test</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> </configuration> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java index e146669..341d135 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java @@ -39,6 +39,7 @@ public class DBAppenderIntegrationTest { static String LOCAL_HOST_NAME; static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; static String[] POSTGRES_CONFORMING_HOST_LIST = new String[] { "haro" }; + static String[] MYSQL_CONFORMING_HOST_LIST = new String[] { "haro" }; int diff = new Random(System.nanoTime()).nextInt(10000); LoggerContext lc = new LoggerContext(); @@ -80,7 +81,6 @@ public class DBAppenderIntegrationTest { Exception e = new Exception("Just testing", getCause()); logger .error("At last an error.", e); - e.printStackTrace(); // check that there were no errors StatusPrinter.print(lc); assertEquals(Status.INFO, lc.getStatusManager().getLevel()); @@ -139,7 +139,7 @@ public class DBAppenderIntegrationTest { @Test public void mysql() throws Exception { // perform test only on conforming hosts - if (!isConformingHostAndJDK16OrHigher()) { + if (!isConformingHostAndJDK16OrHigher(MYSQL_CONFORMING_HOST_LIST)) { return; } doTest("src/test/input/integration/db/mysql-with-driver.xml"); diff --git a/pom.xml b/pom.xml index f56f9ec..56ce38e 100755 --- a/pom.xml +++ b/pom.xml @@ -104,6 +104,13 @@ <version>8.4-701.jdbc4</version> </dependency> <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.9</version> + </dependency> + + + <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> <version>6.0.20</version> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 14 +++--- .../ch/qos/logback/classic/db/dialect/mysql.sql | 58 ++++++++++---------- .../input/integration/db/mysql-with-driver.xml | 26 +++++----- .../classic/db/DBAppenderIntegrationTest.java | 4 +- pom.xml | 7 +++ 5 files changed, 58 insertions(+), 51 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-110-ge6af6bd
by git-noreply＠pixie.qos.ch 23 Mar '10

23 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via e6af6bd2f69de46eed5febf9bb0de8613469a713 (commit) from 8ad8f15265b86671678d40c6109245327ef1f9f7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=e6af6bd2f69de46eed5febf9… http://github.com/ceki/logback/commit/e6af6bd2f69de46eed5febf9bb0de8613469a… commit e6af6bd2f69de46eed5febf9bb0de8613469a713 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 23 14:15:04 2010 +0100 - Adding support for H2 database diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 41559e0..9db2104 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -82,6 +82,12 @@ </dependency> <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java similarity index 89% copy from logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java copy to logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java index ef86c44..3ba8e00 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java @@ -31,21 +31,23 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.db.DriverManagerConnectionSource; +import ch.qos.logback.core.util.StatusPrinter; -public class DBAppenderTest { +public class DBAppenderH2Test { LoggerContext lc; Logger logger; DBAppender appender; DriverManagerConnectionSource connectionSource; - DBAppenderTestFixture dbAppenderTestFixture; + DBAppenderH2TestFixture dbAppenderH2TestFixture; @Before public void setUp() throws SQLException { - dbAppenderTestFixture = new DBAppenderTestFixture(); - dbAppenderTestFixture.setUp(); + dbAppenderH2TestFixture = new DBAppenderH2TestFixture(); + dbAppenderH2TestFixture.setUp(); + lc = new LoggerContext(); lc.setName("default"); logger = lc.getLogger("root"); @@ -54,10 +56,12 @@ public class DBAppenderTest { appender.setContext(lc); connectionSource = new DriverManagerConnectionSource(); connectionSource.setContext(lc); - connectionSource.setDriverClass(DBAppenderTestFixture.HSQLDB_DRIVER_CLASS); - connectionSource.setUrl(dbAppenderTestFixture.url); - connectionSource.setUser(dbAppenderTestFixture.user); - connectionSource.setPassword(dbAppenderTestFixture.password); + connectionSource.setDriverClass(DBAppenderH2TestFixture.H2_DRIVER_CLASS); + connectionSource.setUrl(dbAppenderH2TestFixture.url); + connectionSource.setUser(dbAppenderH2TestFixture.user); + connectionSource.setPassword(dbAppenderH2TestFixture.password); + + connectionSource.start(); appender.setConnectionSource(connectionSource); appender.start(); @@ -69,7 +73,7 @@ public class DBAppenderTest { lc = null; appender = null; connectionSource = null; - dbAppenderTestFixture.tearDown(); + dbAppenderH2TestFixture.tearDown(); } @Test @@ -77,7 +81,8 @@ public class DBAppenderTest { ILoggingEvent event = createLoggingEvent(); appender.append(event); - //StatusPrinter.print(lc.getStatusManager()); + + StatusPrinter.print(lc); Statement stmt = connectionSource.getConnection().createStatement(); ResultSet rs = null; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java similarity index 64% copy from logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java copy to logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java index 46cfd2b..8727b25 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java @@ -15,98 +15,70 @@ package ch.qos.logback.classic.db; import static org.junit.Assert.assertNotNull; -import java.io.PrintWriter; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.Properties; -import org.hsqldb.Server; -import org.hsqldb.ServerConstants; -import org.hsqldb.jdbcDriver; +import org.h2.Driver; -public class DBAppenderTestFixture { +import ch.qos.logback.core.testUtil.RandomUtil; - public static final String HSQLDB_DRIVER_CLASS = "org.hsqldb.jdbcDriver"; +public class DBAppenderH2TestFixture { + + public enum H2Mode { + MEM, FILE, NET; + } + + public static final String H2_DRIVER_CLASS = "org.h2.Driver"; // String serverProps; String url = null; String user = "sa"; String password = ""; - Server server; // boolean isNetwork = true; - HsqlMode mode = HsqlMode.MEM; + H2Mode mode = H2Mode.MEM; - public DBAppenderTestFixture() { + int diff = RandomUtil.getPositiveInt(); + + public DBAppenderH2TestFixture() { } + Connection connection; + public void setUp() throws SQLException { switch (mode) { case NET: - url = "jdbc:hsqldb:hsql://localhost:4808/test"; + url = "jdbc:h2:tcp://localhost:4808/test"; break; case MEM: - url = "jdbc:hsqldb:mem:test;sql.enforce_strict_size=true"; - server = new Server(); - server.setDatabaseName(0, "test"); - server.setDatabasePath(0, url); - server.setLogWriter(new PrintWriter(System.out)); - server.setErrWriter(new PrintWriter(System.out)); - server.setTrace(false); - server.setSilent(false); - server.start(); - + url = "jdbc:h2:mem:test"+diff; break; case FILE: url = "jdbc:hsqldb:file:test;sql.enforce_strict_size=true"; break; } - - // try { - // Class.forName(DRIVER_CLASS); - // } catch (Exception e) { - // e.printStackTrace(); - // System.out.println(this + ".setUp() error: " + e.getMessage()); - // } - // Thread.yield(); - System.out.println(server.getState()); - - int waitCount = 0; - while (server.getState() != ServerConstants.SERVER_STATE_ONLINE - && waitCount < 5) { - try { - waitCount++; - Thread.sleep(1); - } catch (InterruptedException e) { - } - } + connection = newConnection(); createTables(); } public void tearDown() throws SQLException { dropTables(); - - if (mode == HsqlMode.MEM) { - server.stop(); - server = null; - } + connection.close(); } Connection newConnection() throws SQLException { - jdbcDriver driver = new jdbcDriver(); + org.h2.Driver driver = Driver.load(); Properties props = new Properties(); props.setProperty("user", user); props.setProperty("password", password); return driver.connect(url, props); - - // return DriverManager.getConnection(url, user, password); } private void createTables() throws SQLException { - Connection conn = newConnection(); - assertNotNull(conn); + assertNotNull(connection); StringBuffer buf = new StringBuffer(); buf.append("CREATE TABLE logging_event ("); buf.append("timestmp BIGINT NOT NULL,"); @@ -120,7 +92,7 @@ public class DBAppenderTestFixture { buf.append("caller_method VARCHAR(256), "); buf.append("caller_line CHAR(4), "); buf.append("event_id INT NOT NULL IDENTITY);"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); buf = new StringBuffer(); buf.append("CREATE TABLE logging_event_property ("); @@ -129,7 +101,7 @@ public class DBAppenderTestFixture { buf.append("mapped_value LONGVARCHAR,"); buf.append("PRIMARY KEY(event_id, mapped_key),"); buf.append("FOREIGN KEY (event_id) REFERENCES logging_event(event_id));"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); buf = new StringBuffer(); buf.append("CREATE TABLE logging_event_exception ("); @@ -138,26 +110,24 @@ public class DBAppenderTestFixture { buf.append("trace_line VARCHAR(256) NOT NULL,"); buf.append("PRIMARY KEY(event_id, i),"); buf.append("FOREIGN KEY (event_id) REFERENCES logging_event(event_id));"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); } private void dropTables() throws SQLException { - Connection conn = newConnection(); StringBuffer buf = new StringBuffer(); buf.append("DROP TABLE logging_event_exception IF EXISTS;"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); buf = new StringBuffer(); buf.append("DROP TABLE logging_event_property IF EXISTS;"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); buf = new StringBuffer(); buf.append("DROP TABLE logging_event IF EXISTS;"); - query(conn, buf.toString()); + executeQuery(connection, buf.toString()); } - private void query(Connection conn, String expression) throws SQLException { - + private void executeQuery(Connection conn, String expression) throws SQLException { Statement st = null; st = conn.createStatement(); int i = st.executeUpdate(expression); @@ -167,7 +137,5 @@ public class DBAppenderTestFixture { st.close(); } - public enum HsqlMode { - MEM, FILE, NET; - } + } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java similarity index 90% rename from logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java rename to logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java index ef86c44..51117cd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java @@ -32,19 +32,19 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.db.DriverManagerConnectionSource; -public class DBAppenderTest { +public class DBAppenderHSQLTest { LoggerContext lc; Logger logger; DBAppender appender; DriverManagerConnectionSource connectionSource; - DBAppenderTestFixture dbAppenderTestFixture; + DBAppenderHSQLTestFixture dbAppenderHSQLTestFixture; @Before public void setUp() throws SQLException { - dbAppenderTestFixture = new DBAppenderTestFixture(); - dbAppenderTestFixture.setUp(); + dbAppenderHSQLTestFixture = new DBAppenderHSQLTestFixture(); + dbAppenderHSQLTestFixture.setUp(); lc = new LoggerContext(); lc.setName("default"); @@ -54,10 +54,10 @@ public class DBAppenderTest { appender.setContext(lc); connectionSource = new DriverManagerConnectionSource(); connectionSource.setContext(lc); - connectionSource.setDriverClass(DBAppenderTestFixture.HSQLDB_DRIVER_CLASS); - connectionSource.setUrl(dbAppenderTestFixture.url); - connectionSource.setUser(dbAppenderTestFixture.user); - connectionSource.setPassword(dbAppenderTestFixture.password); + connectionSource.setDriverClass(DBAppenderHSQLTestFixture.HSQLDB_DRIVER_CLASS); + connectionSource.setUrl(dbAppenderHSQLTestFixture.url); + connectionSource.setUser(dbAppenderHSQLTestFixture.user); + connectionSource.setPassword(dbAppenderHSQLTestFixture.password); connectionSource.start(); appender.setConnectionSource(connectionSource); appender.start(); @@ -69,7 +69,7 @@ public class DBAppenderTest { lc = null; appender = null; connectionSource = null; - dbAppenderTestFixture.tearDown(); + dbAppenderHSQLTestFixture.tearDown(); } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java similarity index 98% rename from logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java rename to logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java index 46cfd2b..1f6e00f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTestFixture.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java @@ -25,7 +25,7 @@ import org.hsqldb.Server; import org.hsqldb.ServerConstants; import org.hsqldb.jdbcDriver; -public class DBAppenderTestFixture { +public class DBAppenderHSQLTestFixture { public static final String HSQLDB_DRIVER_CLASS = "org.hsqldb.jdbcDriver"; // String serverProps; @@ -37,7 +37,7 @@ public class DBAppenderTestFixture { // boolean isNetwork = true; HsqlMode mode = HsqlMode.MEM; - public DBAppenderTestFixture() { + public DBAppenderHSQLTestFixture() { } public void setUp() throws SQLException { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/PackageTest.java index 6fdc4d3..869fe27 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/PackageTest.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( {DBAppenderTest.class}) +@SuiteClasses( {DBAppenderHSQLTest.class}) public class PackageTest { } \ No newline at end of file diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java b/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java index 55d8e8c..29a5dee 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/db/ConnectionSourceBase.java @@ -55,9 +55,9 @@ public abstract class ConnectionSourceBase extends ContextAwareBase implements C 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); + addInfo("Driver name="+meta.getDriverName()); + addInfo("Driver version="+meta.getDriverVersion()); + addInfo("supportsGetGeneratedKeys="+supportsGetGeneratedKeys); } catch (SQLException se) { addWarn("Could not discover the dialect to use.", se); diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java index be8bc33..ed08712 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java @@ -50,7 +50,6 @@ public abstract class DBAppenderBase<E> extends AppenderBase<E> { "DBAppender cannot function without a connection source"); } - System.out.println(connectionSource.supportsGetGeneratedKeys()); sqlDialect = DBUtil .getDialectFromCode(connectionSource.getSQLDialectCode()); if (getGeneratedKeysMethod() != null) { diff --git a/pom.xml b/pom.xml index 942e470..f56f9ec 100755 --- a/pom.xml +++ b/pom.xml @@ -94,9 +94,14 @@ <version>1.8.0.7</version> </dependency> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.132</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 6 ++ .../{DBAppenderTest.java => DBAppenderH2Test.java} | 25 +++-- ...stFixture.java => DBAppenderH2TestFixture.java} | 90 ++++++------------- ...DBAppenderTest.java => DBAppenderHSQLTest.java} | 18 ++-- ...Fixture.java => DBAppenderHSQLTestFixture.java} | 4 +- .../ch/qos/logback/classic/db/PackageTest.java | 2 +- .../qos/logback/core/db/ConnectionSourceBase.java | 6 +- .../ch/qos/logback/core/db/DBAppenderBase.java | 1 - pom.xml | 11 ++- 9 files changed, 73 insertions(+), 90 deletions(-) copy logback-classic/src/test/java/ch/qos/logback/classic/db/{DBAppenderTest.java => DBAppenderH2Test.java} (89%) copy logback-classic/src/test/java/ch/qos/logback/classic/db/{DBAppenderTestFixture.java => DBAppenderH2TestFixture.java} (64%) rename logback-classic/src/test/java/ch/qos/logback/classic/db/{DBAppenderTest.java => DBAppenderHSQLTest.java} (90%) rename logback-classic/src/test/java/ch/qos/logback/classic/db/{DBAppenderTestFixture.java => DBAppenderHSQLTestFixture.java} (98%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-97) Starvation on AppenderBase.doAppend
by Joern Huxhorn (JIRA) 23 Mar '10

23 Mar '10

Starvation on AppenderBase.doAppend ----------------------------------- Key: LBCORE-97 URL: http://jira.qos.ch/browse/LBCORE-97 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.15 Reporter: Joern Huxhorn Assignee: Logback dev list Priority: Critical Attachments: AppenderBaseLock.patch The problem we are facing here is that several threads are trying to obtain the object monitor of the exact same resource, namely the Appender. The assumption that multiple threads waiting for ownership of a monitor would receive the monitor in the order that they tried to acquire it is simply incorrect. This is documented behavior. See the last paragraph of [1]: "Likewise, no assumptions should be made about the order in which threads are granted ownership of a monitor or the order in which threads wake in response to the notify or notifyAll method. An excellent reference for these topics is Chapter 9, "Threads," in Joshua Bloch's book Effective Java Programming Language Guide. " The documentation of Object.notifyAll() [2] states the following: "[..] The awakened threads will compete in the usual manner with any other threads that might be actively competing to synchronize on this object; for example, the awakened threads enjoy no reliable privilege or disadvantage in being the next thread to lock this object." The documentation in [5] also lists the following as a weak-spot of Built-in Synchronization in J2SE 1.4.x: "No way to alter the semantics of a lock, for example, with respect to reentrancy, read versus write protection, or fairness." In LBCORE-96 Ceki stated the following: "Logback is using the standard synchronization mechanism found in the JDK. You are saying that that mechanism is unsuitable which, truth be told, sounds quite suspicious." Yes, it's unsuitable in this situation because obtaining the object monitor is not guaranteed to be fair. It's not working in a "first come, first serve" manner. I assumed that, too, but it isn't the case. I had the exact same problem in Lilith some time ago because I made exactly this very same wrong assumption. Fairness of object monitor lock acquisition seems to be logical and a "good thing" but it's not specified that way, and for good reasons. Without fairness in place, the VM can optimize the execution of an application much better. A context switch is a costly operation for a CPU so performance is increased significantly if such a switch can be omitted. Concerning a test-case, this would be pretty hardcore to implement since it's 100% implementation dependent. One implementation *may* handle the locking of object monitors fairly while others don't. Therefore I'll try the following first: I assume I could convince you that object monitor acquisition (OMA) is not fair. If we take that for granted the following scenario should show my point: There are 4 Threads (e.g. 4 Threads handling concurrent webapp-requests) that have one single chokepoint, the appender. Since OMA isn't fair, it's possible that only some of those threads can work at all (see [3]). Exactly that is happening right now in our webapp running on a 4-core Solaris on JDK6. My next assumption is that we both agree that this isn't acceptable behavior. Logging should be handled "first come, first served" so that if Thread A is waiting to append an event and Thread B is waiting to append an event subsequently, the actual appending order should be A, then B. This is currently not the case. It *may* be the case but there is no guarantee of it. One could even argue that the logging system is working incorrectly (aside from the starvation problem) because events are appended in a different order than the actual execution of the logger call. The only way to prevent this is the introduction of fairness into the locking process. The way to do this is to use ReentrantLock [4]. >From the ReentrantLock javadoc: "The constructor for this class accepts an optional fairness parameter. When set true, under contention, locks favor granting access to the longest-waiting thread. Otherwise this lock does not guarantee any particular access order. Programs using fair locks accessed by many threads may display lower overall throughput (i.e., are slower; often much slower) than those using the default setting, but have smaller variances in times to obtain locks and guarantee lack of starvation." This is exactly what is absolutely necessary for a logging framework. Logging must *NOT* be able to introduce a starvation problem into a multi-threaded application! And it does exactly that right now. I doubt that the performance will decrease in a significant manner due to the use of a fair ReentrantLock but even if this would be the case it would be necessary anyway. Otherwise, appending simply isn't working correctly. [1] http://java.sun.com/j2se/1.5.0/docs/guide/vm/thread-priorities.html [2] http://java.sun.com/javase/6/docs/api/java/lang/Object.html#notifyAll() [3] http://en.wikipedia.org/wiki/Starvation_(computing) [4] http://java.sun.com/javase/6/docs/api/java/util/concurrent/locks/ReentrantL… [5] http://java.sun.com/developer/technicalArticles/J2SE/concurrency/ -- 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

13 75

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-109-g8ad8f15
by git-noreply＠pixie.qos.ch 23 Mar '10

23 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 8ad8f15265b86671678d40c6109245327ef1f9f7 (commit) from 1903ec955f2575cdad61fa9a2df6ac20b4ac3638 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8ad8f15265b86671678d40c6… http://github.com/ceki/logback/commit/8ad8f15265b86671678d40c6109245327ef1f… commit 8ad8f15265b86671678d40c6109245327ef1f9f7 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 23 09:34:21 2010 +0100 - upgrade to SLF4J 1.5.11 - document the timzezone option in %date - minor edits diff --git a/logback-examples/src/main/java/chapters/configuration/MyApp3.java b/logback-examples/src/main/java/chapters/configuration/MyApp3.java index 2cc3199..99c8733 100644 --- a/logback-examples/src/main/java/chapters/configuration/MyApp3.java +++ b/logback-examples/src/main/java/chapters/configuration/MyApp3.java @@ -40,7 +40,7 @@ public class MyApp3 { lc.reset(); configurator.doConfigure(args[0]); } catch (JoranException je) { - je.printStackTrace(); + // StatusPrinter will handle this } StatusPrinter.printInCaseOfErrorsOrWarnings(lc); diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index d9f801a..5b5bf09 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -497,7 +497,7 @@ public class MyApp3 { lc.reset(); configurator.doConfigure(args[0]); } catch (JoranException je) { - je.printStackTrace(); + // StatusPrinter will handle this } StatusPrinter.printInCaseOfErrorsOrWarnings(lc); diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index f91d654..99a2c74 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -576,6 +576,23 @@ WARN [main]: Message 2 <td>20 oct. 2006;14:06:49.812 </td> </tr> </table> + + In addition to the date pattern, this converter admits a + second option as the timezone. Thus, the + '%date{HH:mm:ss.SSS,Australia/Perth} would print the time in + the time zone of Perth Australia, the worlds most isolated + city. + + + Given that the comma ',' character is the option + separator, the pattern string [HH:mm:ss,SSS] will print the + time in the [SSS] time zone which does not exist. Thus, the + time will be printed in the default GMT timezone. If you + wish to include a comma in your date pattern, then simply + enclose the pattern between quotes. For example, + %date{"HH:mm:ss,SSS"}. + + </td> </tr> diff --git a/pom.xml b/pom.xml index 7f1e6ea..942e470 100755 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <properties>  - <slf4j.version>1.5.10</slf4j.version> + <slf4j.version>1.5.11</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties> ----------------------------------------------------------------------- Summary of changes: .../main/java/chapters/configuration/MyApp3.java | 2 +- .../src/site/pages/manual/configuration.html | 2 +- logback-site/src/site/pages/manual/layouts.html | 17 +++++++++++++++++ pom.xml | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-170) DbAppender discards all exception' details
by Tomasz Nurkiewicz (JIRA) 23 Mar '10

23 Mar '10

DbAppender discards all exception' details ------------------------------------------ Key: LBCLASSIC-170 URL: http://jira.qos.ch/browse/LBCLASSIC-170 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.18 Reporter: Tomasz Nurkiewicz Assignee: Logback dev list DbAppender uses a single table logging_event_exception to persist stack traces, inserting one row per each stack frame. Also, each row has its parent event id. Unfortunately this approach loses a lot of exception details, making it unable to fully recreate ILoggingEvent instance that was logged by the DbAppender. List of attributes that are missing: * exception message * exception class name * exception root cause Also logging_event_exception saves the result of ch.qos.logback.classic.spi.StackTraceElementProxy#toString (which refers to java.lang.StackTraceElement#toString) instead of saving each element of java.lang.StackTraceElement separately. Now, in order to recreate StackTraceElement instance one must parse (probably using regular expression) string saved in trace_line attribute. My suggestion would be to create two tables: * logging_event_throwable with columns: message, class_name and cause foreign key referencing other logging_event_throwable instance * logging_event_stack_frame with columns: class_name, method, file, line and a foreign key referencing logging_event_throwable + indexing column Also logging_event would have a optional foreign key to logging_event_throwable. This modifications in database schema would allow to fully recreate ILoggingEvent. For backward compatibility ch.qos.logback.classic.db.DBAppender should remain untouched. The idea is to subclass it and override ch.qos.logback.classic.db.DBAppender#insertThrowable. -- 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

3 5

[JIRA] Created: (LBCLASSIC-197) DBAppender support for SQLAnywhere database
by Michael Lynch (JIRA) 22 Mar '10

22 Mar '10

DBAppender support for SQLAnywhere database ------------------------------------------- Key: LBCLASSIC-197 URL: http://jira.qos.ch/browse/LBCLASSIC-197 Project: logback-classic Issue Type: Improvement Components: appender Affects Versions: 0.9.18 Environment: SQLAnywhere 10.x Reporter: Michael Lynch Assignee: Logback dev list Add Sybase SQLAnywhere dialect to logback-classic as SQLAnywhere JDBC driver does not support getGeneratedKeys. -- 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

3 7

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-108-g1903ec9
by git-noreply＠pixie.qos.ch 22 Mar '10

22 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 1903ec955f2575cdad61fa9a2df6ac20b4ac3638 (commit) from 901a3a19b1f89939a2fed00c2cdc5ebd8c8bec77 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=1903ec955f2575cdad61fa9a… http://github.com/ceki/logback/commit/1903ec955f2575cdad61fa9a2df6ac20b4ac3… commit 1903ec955f2575cdad61fa9a2df6ac20b4ac3638 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 22 21:44:27 2010 +0100 - added H2 and Sybase support diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql new file mode 100644 index 0000000..0ba314d --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql @@ -0,0 +1,35 @@ +# This SQL script creates the required tables by ch.qos.logback.classic.db.DBAppender. +# +# It is intended for HSQL databases. It has been tested on HSQL 1.8.07. + +DROP TABLE logging_event_exception IF EXISTS; +DROP TABLE logging_event_property IF EXISTS; +DROP TABLE logging_event IF EXISTS; + +CREATE TABLE logging_event ( + timestmp BIGINT NOT NULL, + formatted_message LONGVARCHAR NOT NULL, + logger_name VARCHAR(256) NOT NULL, + level_string VARCHAR(256) NOT NULL, + thread_name VARCHAR(256), + reference_flag SMALLINT, + caller_filename VARCHAR(256), + caller_class VARCHAR(256), + caller_method VARCHAR(256), + caller_line CHAR(4), + event_id INT NOT NULL IDENTITY); + + +CREATE TABLE logging_event_property ( + event_id INT NOT NULL, + mapped_key VARCHAR(254) NOT NULL, + mapped_value LONGVARCHAR, + PRIMARY KEY(event_id, mapped_key), + FOREIGN KEY (event_id) REFERENCES logging_event(event_id)); + +CREATE TABLE logging_event_exception ( + event_id INT NOT NULL, + i SMALLINT NOT NULL, + trace_line VARCHAR(256) NOT NULL, + PRIMARY KEY(event_id, i), + FOREIGN KEY (event_id) REFERENCES logging_event(event_id)); \ No newline at end of file diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/sybaseSqlAnywhere.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/sybaseSqlAnywhere.sql new file mode 100644 index 0000000..4daa77d --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/sybaseSqlAnywhere.sql @@ -0,0 +1,38 @@ +-- This SQL script creates the required tables by ch.qos.logback.classic.db.DBAppender +-- for Sybase SQLAnywhere. Tested on SQLAnywhere 10.0.1. + +DROP TABLE logging_event_property +DROP TABLE logging_event_exception +DROP TABLE logging_event + +CREATE TABLE logging_event +( +timestmp bigint NOT NULL, +formatted_message LONG VARCHAR NOT NULL, +logger_name VARCHAR(254) NOT NULL, +level_string VARCHAR(254) NOT NULL, +thread_name VARCHAR(254), +reference_flag SMALLINT, +caller_filename VARCHAR(254) NOT NULL, +caller_class VARCHAR(254) NOT NULL, +caller_method VARCHAR(254) NOT NULL, +caller_line varCHAR(4) NOT NULL, +event_id int NOT NULL DEFAULT AUTOINCREMENT, +PRIMARY KEY(event_id) +) + +CREATE TABLE logging_event_property + ( + event_id int NOT NULL REFERENCES logging_event(event_id), + mapped_key VARCHAR(254) NOT NULL, + mapped_value LONG VARCHAR, + PRIMARY KEY(event_id, mapped_key) + ) + +CREATE TABLE logging_event_exception + ( + event_id int NOT NULL REFERENCES logging_event(event_id) , + i SMALLINT NOT NULL, + trace_line VARCHAR(254) NOT NULL, + PRIMARY KEY(event_id, i) + ) diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/H2Dialect.java b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/H2Dialect.java new file mode 100644 index 0000000..3e9c0f3 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/H2Dialect.java @@ -0,0 +1,28 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.core.db.dialect; + +/** + * The HSQLDB dialect. + * + * @author Ceki Gülcü + */ +public class H2Dialect implements SQLDialect { + public static final String SELECT_CURRVAL = "CALL IDENTITY()"; + + public String getSelectInsertId() { + return SELECT_CURRVAL; + } + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java new file mode 100644 index 0000000..6768e25 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SybaseSqlAnywhereDialect.java @@ -0,0 +1,34 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ + +package ch.qos.logback.core.db.dialect; + +public class SybaseSqlAnywhereDialect implements SQLDialect { + + /** + * The Sybase SQLAnywhere Dialect + * + * Note that the dialect is not needed if your JDBC driver supports + * the getGeneratedKeys method introduced in JDBC 3.0 specification. + * + * @author Michael Lynch + */ + + public static final String SELECT_CURRVAL = "SELECT @@identity id"; + + public String getSelectInsertId() { + return SELECT_CURRVAL; + } + +} ----------------------------------------------------------------------- Summary of changes: .../classic/db/dialect/{hsqldb.sql => h2.sql} | 2 +- .../classic/db/dialect/sybaseSqlAnywhere.sql | 38 ++++++++++++++++++++ .../dialect/{HSQLDBDialect.java => H2Dialect.java} | 2 +- ...BDialect.java => SybaseSqlAnywhereDialect.java} | 22 +++++++---- 4 files changed, 54 insertions(+), 10 deletions(-) copy logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/{hsqldb.sql => h2.sql} (94%) create mode 100644 logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/sybaseSqlAnywhere.sql copy logback-core/src/main/java/ch/qos/logback/core/db/dialect/{HSQLDBDialect.java => H2Dialect.java} (93%) copy logback-core/src/main/java/ch/qos/logback/core/db/dialect/{HSQLDBDialect.java => SybaseSqlAnywhereDialect.java} (61%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-107-g901a3a1
by git-noreply＠pixie.qos.ch 22 Mar '10

22 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 901a3a19b1f89939a2fed00c2cdc5ebd8c8bec77 (commit) from 130277bce03f608db7ab555ec28705f9fc974e1e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=901a3a19b1f89939a2fed00c… http://github.com/ceki/logback/commit/901a3a19b1f89939a2fed00c2cdc5ebd8c8be… commit 901a3a19b1f89939a2fed00c2cdc5ebd8c8bec77 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 22 21:43:33 2010 +0100 - adding H2 and Sybase support diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java index 330b573..cfb90c2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/DBUtil.java @@ -30,6 +30,8 @@ public class DBUtil extends ContextAwareBase { // private static final String MSSQL_PART = "mssqlserver4"; private static final String MSSQL_PART = "microsoft"; private static final String HSQL_PART = "hsql"; + private static final String H2_PART = "h2"; + private static final String SYBASE_SQLANY_PART = "sql anywhere"; public static SQLDialectCode discoverSQLDialect(DatabaseMetaData meta) { SQLDialectCode dialectCode = SQLDialectCode.UNKNOWN_DIALECT; @@ -48,6 +50,10 @@ public class DBUtil extends ContextAwareBase { return SQLDialectCode.MSSQL_DIALECT; } else if (dbName.indexOf(HSQL_PART) != -1) { return SQLDialectCode.HSQL_DIALECT; + } else if (dbName.indexOf(H2_PART) != -1) { + return SQLDialectCode.H2_DIALECT; + } else if (dbName.indexOf(SYBASE_SQLANY_PART) != -1) { + return SQLDialectCode.SYBASE_SQLANYWHERE_DIALECT; } else { return SQLDialectCode.UNKNOWN_DIALECT; } @@ -64,24 +70,31 @@ public class DBUtil extends ContextAwareBase { switch (sqlDialectType) { case POSTGRES_DIALECT: sqlDialect = new PostgreSQLDialect(); - break; + case MYSQL_DIALECT: sqlDialect = new MySQLDialect(); - break; + case ORACLE_DIALECT: sqlDialect = new OracleDialect(); - break; + case MSSQL_DIALECT: sqlDialect = new MsSQLDialect(); - break; + case HSQL_DIALECT: sqlDialect = new HSQLDBDialect(); + case H2_DIALECT: + sqlDialect = new H2Dialect(); + break; + + case SYBASE_SQLANYWHERE_DIALECT: + sqlDialect = new SybaseSqlAnywhereDialect(); break; + } return sqlDialect; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java index 3176036..b643dec 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java +++ b/logback-core/src/main/java/ch/qos/logback/core/db/dialect/SQLDialectCode.java @@ -19,5 +19,7 @@ public enum SQLDialectCode { MYSQL_DIALECT, ORACLE_DIALECT, MSSQL_DIALECT, - HSQL_DIALECT; + HSQL_DIALECT, + H2_DIALECT, + SYBASE_SQLANYWHERE_DIALECT; } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 664b15a..92ca237 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -134,17 +134,26 @@ reported by Tom SH Liu. - DBAppender now outputs exception class and message. It will also output root causes, fixing <a href="http://jira.qos.ch/browse/LBCLASSIC-170">LBCLASSIC-170</a> reported by Tomasz Nurkiewicz. + You can now override table and column names in DBAppender. This + feature was requested in <a + href="http://jira.qos.ch/browse/LBCLASSIC-188">LBCLASSIC-188</a> + reported by Tomasz Nurkiewicz. + + Fixed missing EVENT_ID column problem on PostgreSQL as reported in <a href="http://jira.qos.ch/browse/LBCORE-126">LBCORE-126</a> by Brian Edwards. + Added Sybase SQLAnywhere support in DBAppender. This feature + was requested by Michael Lynch in <a + href="http://jira.qos.ch/browse/LBCLASSIC-197">LBCLASSIC-197</a>. + Fixed <a href="http://jira.qos.ch/browse/LBSITE-36">LBSITE-36</a> reported by John Jimenez. ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/db/dialect/DBUtil.java | 21 ++++++++++++++++--- .../logback/core/db/dialect/SQLDialectCode.java | 4 ++- logback-site/src/site/pages/news.html | 11 +++++++++- 3 files changed, 30 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-106-g130277b
by git-noreply＠pixie.qos.ch 22 Mar '10

22 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 130277bce03f608db7ab555ec28705f9fc974e1e (commit) from 39dbbf9a5f7d414db63e89b18d09d04fd0ae6498 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=130277bce03f608db7ab555e… http://github.com/ceki/logback/commit/130277bce03f608db7ab555ec28705f9fc974… commit 130277bce03f608db7ab555ec28705f9fc974e1e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 22 17:46:26 2010 +0100 Fixed LBCLASSIC-170 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java index e563109..7c92e50 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java @@ -25,15 +25,18 @@ import java.util.Set; import ch.qos.logback.classic.db.names.DBNameResolver; import ch.qos.logback.classic.db.names.DefaultDBNameResolver; import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.StackTraceElementProxy; +import ch.qos.logback.classic.spi.ThrowableProxyUtil; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.db.DBAppenderBase; /** * The DBAppender inserts logging events into three database tables in a format - * independent of the Java programming language. + * independent of the Java programming language. * - * For more information about this appender, please refer to the online manual at - * http://logback.qos.ch/manual/appenders.html#DBAppender + * For more information about this appender, please refer to the online manual + * at http://logback.qos.ch/manual/appenders.html#DBAppender * * @author Ceki Gülcü * @author Ray DeCampo @@ -51,7 +54,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { // PreparedStatement.getGeneratedKeys() method was added in JDK 1.4 Method getGeneratedKeysMethod; try { - // the + // the getGeneratedKeysMethod = PreparedStatement.class.getMethod( "getGeneratedKeys", (Class[]) null); } catch (Exception ex) { @@ -59,7 +62,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { } GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod; } - + public DBAppender() { } @@ -69,7 +72,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { @Override public void start() { - if(dbNameResolver == null) + if (dbNameResolver == null) dbNameResolver = new DefaultDBNameResolver(); insertExceptionSQL = SQLBuilder.buildInsertExceptionSQL(dbNameResolver); insertPropertiesSQL = SQLBuilder.buildInsertPropertiesSQL(dbNameResolver); @@ -85,7 +88,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { 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"); @@ -97,12 +100,12 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { insertProperties(mergedMap, connection, eventId); if (event.getThrowableProxy() != null) { - insertThrowable(event.getThrowableProxy().getStackTraceElementProxyArray(), connection, eventId); + insertThrowable(event.getThrowableProxy(), connection, eventId); } } - void bindLoggingEventWithInsertStatement(PreparedStatement stmt, ILoggingEvent event) - throws SQLException { + void bindLoggingEventWithInsertStatement(PreparedStatement stmt, + ILoggingEvent event) throws SQLException { stmt.setLong(1, event.getTimeStamp()); stmt.setString(2, event.getFormattedMessage()); stmt.setString(3, event.getLoggerName()); @@ -111,8 +114,8 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { stmt.setShort(6, DBHelper.computeReferenceMask(event)); } - void bindCallerDataWithPreparedStatement(PreparedStatement stmt, StackTraceElement[] callerDataArray) - throws SQLException { + void bindCallerDataWithPreparedStatement(PreparedStatement stmt, + StackTraceElement[] callerDataArray) throws SQLException { StackTraceElement callerData = callerDataArray[0]; if (callerData != null) { stmt.setString(7, callerData.getFileName()); @@ -128,7 +131,8 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { // we consider that event-specific properties should have priority over // context-wide // properties. - Map<String, String> loggerContextMap = event.getLoggerContextVO().getPropertyMap(); + Map<String, String> loggerContextMap = event.getLoggerContextVO() + .getPropertyMap(); Map<String, String> mdcMap = event.getMDCPropertyMap(); if (loggerContextMap != null) { mergedMap.putAll(loggerContextMap); @@ -149,7 +153,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { protected String getInsertSQL() { return insertSQL; } - + protected void insertProperties(Map<String, String> mergedMap, Connection connection, int eventId) throws SQLException { Set propertiesKeys = mergedMap.keySet(); @@ -180,28 +184,71 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { insertPropertiesStatement = null; } } - - protected void insertThrowable(StackTraceElementProxy[] stepArray, Connection connection, + + /** + * Add an exception statement either as a batch or execute immediately if + * batch updates are not supported. + */ + void updateExceptionStatement(PreparedStatement exceptionStatement, + String txt, short i, int eventId) throws SQLException { + exceptionStatement.setInt(1, eventId); + exceptionStatement.setShort(2, i); + exceptionStatement.setString(3, txt); + if (cnxSupportsBatchUpdates) { + exceptionStatement.addBatch(); + } else { + exceptionStatement.execute(); + } + } + + short buildExceptionStatement(IThrowableProxy tp, short baseIndex, + PreparedStatement insertExceptionStatement, int eventId) + throws SQLException { + + StringBuilder buf = new StringBuilder(); + ThrowableProxyUtil.printFirstLine(buf, tp); + updateExceptionStatement(insertExceptionStatement, buf.toString(), + baseIndex++, eventId); + + int commonFrames = tp.getCommonFrames(); + StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); + for (int i = 0; i < stepArray.length - commonFrames; i++) { + StringBuilder sb = new StringBuilder(); + sb.append(CoreConstants.TAB); + ThrowableProxyUtil.printSTEP(sb, stepArray[i]); + updateExceptionStatement(insertExceptionStatement, sb.toString(), + baseIndex++, eventId); + } + + if (commonFrames > 0) { + StringBuilder sb = new StringBuilder(); + sb.append(CoreConstants.TAB).append("... ").append(commonFrames).append( + " common frames omitted"); + updateExceptionStatement(insertExceptionStatement, sb.toString(), + baseIndex++, eventId); + } + + return baseIndex; + } + + protected void insertThrowable(IThrowableProxy tp, Connection connection, int eventId) throws SQLException { - PreparedStatement insertExceptionStatement = connection + PreparedStatement exceptionStatement = connection .prepareStatement(insertExceptionSQL); - for (short i = 0; i < stepArray.length; i++) { - insertExceptionStatement.setInt(1, eventId); - insertExceptionStatement.setShort(2, i); - insertExceptionStatement.setString(3, stepArray[i].toString()); - if (cnxSupportsBatchUpdates) { - insertExceptionStatement.addBatch(); - } else { - insertExceptionStatement.execute(); - } + short baseIndex = 0; + while (tp != null) { + baseIndex = buildExceptionStatement(tp, baseIndex, exceptionStatement, + eventId); + tp = tp.getCause(); } + if (cnxSupportsBatchUpdates) { - insertExceptionStatement.executeBatch(); + exceptionStatement.executeBatch(); } - insertExceptionStatement.close(); - insertExceptionStatement = null; + exceptionStatement.close(); + exceptionStatement = null; } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java index a7e545c..4a841d7 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java @@ -13,21 +13,16 @@ */ package ch.qos.logback.classic.pattern; -import ch.qos.logback.classic.spi.ClassPackagingData; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.StackTraceElementProxy; +import ch.qos.logback.classic.spi.ThrowableProxyUtil; public class ExtendedThrowableProxyConverter extends ThrowableProxyConverter { @Override protected void extraData(StringBuilder builder, StackTraceElementProxy step) { - if (step != null) { - ClassPackagingData pi = step.getClassPackagingData(); - if (pi != null) { - builder.append(" [").append(pi.getCodeLocation()).append(':').append( - pi.getVersion()).append(']'); - } + ThrowableProxyUtil.appendPackagingData(builder, step); } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java index 5b45359..be8dc67 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java @@ -81,7 +81,7 @@ public class ThrowableProxyUtil { return sb.toString(); } - static void appendPackagingData(StringBuilder builder, StackTraceElementProxy step) { + public static void appendPackagingData(StringBuilder builder, StackTraceElementProxy step) { if (step != null) { ClassPackagingData cpd = step.getClassPackagingData(); if (cpd != null) { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java index 5d1f26b..e146669 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java @@ -76,14 +76,21 @@ public class DBAppenderIntegrationTest { 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")); + Exception e = new Exception("Just testing", getCause()); + logger + .error("At last an error.", e); + e.printStackTrace(); // check that there were no errors StatusPrinter.print(lc); assertEquals(Status.INFO, lc.getStatusManager().getLevel()); } + Throwable getCause() { + return new IllegalStateException("test cause"); + } + static boolean isConformingHostAndJDK16OrHigher(String[] conformingHostList) { if (!Env.isJDK6OrHigher()) { return false; diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 912666c..664b15a 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -134,6 +134,17 @@ reported by Tom SH Liu. + + DBAppender now outputs exception class and message. It will + also output root causes, fixing + <a href="http://jira.qos.ch/browse/LBCLASSIC-170">LBCLASSIC-170</a> + reported by Tomasz Nurkiewicz. + + + Fixed missing EVENT_ID column problem on PostgreSQL as reported + in <a href="http://jira.qos.ch/browse/LBCORE-126">LBCORE-126</a> + by Brian Edwards. + Fixed <a href="http://jira.qos.ch/browse/LBSITE-36">LBSITE-36</a> reported by John Jimenez. ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/classic/db/DBAppender.java | 105 ++++++++++++++------ .../pattern/ExtendedThrowableProxyConverter.java | 9 +-- .../logback/classic/spi/ThrowableProxyUtil.java | 2 +- .../classic/db/DBAppenderIntegrationTest.java | 9 ++- logback-site/src/site/pages/news.html | 11 ++ 5 files changed, 98 insertions(+), 38 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0