Merge pull request pentaho#2153 from matthewtckr/PDI-14925

[PDI-14925] Add Log4JDBC
kiana · Jun 16, 2016 · 252b973 · 252b973
2 parents 9f4e409 + 63b0ae9
commit 252b973
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 1 deletion.
diff --git a/assembly/package-res/classes/log4j.xml b/assembly/package-res/classes/log4j.xml
@@ -41,6 +41,42 @@
       </layout>
    </appender>
 
+   <!-- ================== -->
+   <!-- Log4JDBC Appenders -->
+   <!-- ================== -->
+   <!--
+   <appender name="sql-appender" class="org.apache.log4j.FileAppender">
+      <param name="File" value="logs/log4jdbc-sql.log"/>
+      <param name="Append" value="false"/>
+      <layout class="org.apache.log4j.PatternLayout">
+        <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} &lt;%t&gt; %m%n%n"/>
+      </layout>
+   </appender>
+
+   <appender name="sql-timing-appender" class="org.apache.log4j.FileAppender">
+      <param name="File" value="logs/log4jdbc-sqltiming.log"/>
+      <param name="Append" value="false"/>
+      <layout class="org.apache.log4j.PatternLayout">
+        <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n"/>
+      </layout>
+   </appender>
+
+   <appender name="jdbc-appender" class="org.apache.log4j.FileAppender">
+      <param name="File" value="logs/log4jdbc-jdbc.log"/>
+      <param name="Append" value="false"/>
+      <layout class="org.apache.log4j.PatternLayout">
+        <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n"/>
+      </layout>
+   </appender>
+
+   <appender name="connection-appender" class="org.apache.log4j.FileAppender">
+      <param name="File" value="logs/log4jdbc-connection.log"/>
+      <param name="Append" value="false"/>
+      <layout class="org.apache.log4j.PatternLayout">
+        <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n"/>
+      </layout>
+   </appender>
+   -->
    <!-- ============================== -->
    <!-- Append messages to the console -->
    <!-- ============================== -->
@@ -81,5 +117,33 @@
       <!--<appender-ref ref="PENTAHOFILE"/>-->
    </root>
 
-
+   <!-- ================ -->
+   <!-- Log4JDBC Loggers -->
+   <!-- ================ -->
+   <!--
+   <logger name="jdbc.sqlonly" additivity="false">
+    <level value="info"/>
+    <appender-ref ref="sql-appender"/>
+   </logger>
+
+   <logger name="jdbc.sqltiming" additivity="false">
+      <level value="info"/>
+      <appender-ref ref="sql-timing-appender"/>
+   </logger>
+
+   <logger name="jdbc.audit" additivity="false">
+      <level value="info"/>
+      <appender-ref ref="jdbc-appender"/>
+   </logger>
+
+   <logger name="jdbc.resultset" additivity="false">
+      <level value="info"/>
+      <appender-ref ref="jdbc-appender"/>
+   </logger>
+  
+   <logger name="jdbc.connection" additivity="false">
+      <level value="info"/>
+      <appender-ref ref="connection-appender"/>
+   </logger>
+   -->
 </log4j:configuration>
diff --git a/engine/ivy.xml b/engine/ivy.xml
@@ -101,6 +101,7 @@
 	<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.15.v20140411" transitive="false"  conf="default->default"/>
 	<dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.15.v20140411" transitive="false"  conf="default->default"/>
 	<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.15.v20140411" transitive="false"  conf="default->default"/>
+	<dependency org="com.googlecode.log4jdbc" name="log4jdbc" rev="1.2" transitive="false" conf="default->default"/>
 
     <!-- OLAP4J is bringing in an older version of beanutils-core than is needed -->
     <dependency org="commons-beanutils"   name="commons-beanutils-core" rev="1.8.0"         transitive="false"/>