Martin Peřina has uploaded a new change for review. Change subject: core: Replace log4j with JUL backend in dal tests ......................................................................
core: Replace log4j with JUL backend in dal tests Replaces log4j with java.util.logging backend in dal tests. Change-Id: I8994411aaada821a0d4e1127c24cbcc6baf39696 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/dal/pom.xml D backend/manager/modules/dal/src/test/resources/log4j.xml A backend/manager/modules/dal/src/test/resources/logging.properties 3 files changed, 35 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/34184/1 diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index 9b5cd5b..ec246b0 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -62,14 +62,25 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> + + <!-- JUL is used as logging backend for tests --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + + <!-- Needed until slf4j will be used as logging frontend in the whole project --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + </dependencies> <build> <filters> @@ -126,6 +137,9 @@ <exclude>**/DBConfigUtilsTest.java</exclude> <exclude>**/BatchProcedureCallTest.java</exclude> </excludes> + <systemPropertyVariables> + <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file> + </systemPropertyVariables> </configuration> </plugin> @@ -147,6 +161,7 @@ <configuration combine.self="override"> <excludes/> <systemPropertyVariables> + <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file> <ovirt-engine.config.defaults>src/test/resources/engine.conf</ovirt-engine.config.defaults> <ovirt-engine.config.vars>/dev/null</ovirt-engine.config.vars> <ovirt-engine.config.base>${basedir}/src/test/resources</ovirt-engine.config.base> diff --git a/backend/manager/modules/dal/src/test/resources/log4j.xml b/backend/manager/modules/dal/src/test/resources/log4j.xml deleted file mode 100644 index 5259be3..0000000 --- a/backend/manager/modules/dal/src/test/resources/log4j.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - - <!-- Log levels:DEBUG,INFO,WARN,ERROR,FATAL --> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - - <!-- ======================= --> - <!-- oVirt categories --> - <!-- ======================= --> - - <!--TOP configuration for all oVirt categories --> - <category name="org.ovirt.engine.core" additivity="false"> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </category> - - <category name="org.ovirt.engine.core.utils.ejb.EJBUtilsStrategy" additivity="false" > - <priority value="ERROR"/> - <appender-ref ref="CONSOLE"/> - </category> - - <!--Postgres causes lots of verbose messages in INFO level: - "Added default SqlReturnResultSet parameter named #result-set-1"--> - <category name="org.ovirt.engine.core.dal.dbbroker.PostgresDbEngineDialect$PostgresJdbcTemplate"> - <priority value="WARN"/> - <appender-ref ref="CONSOLE"/> - </category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root> - <!-- - Set the root logger priority via a system property. Note this is parsed by log4j, - so the full JBoss system property format is not supported; e.g. - setting a default via ${jboss.server.log.threshold:WARN} will not work. - --> - <priority value="WARN"/> - <appender-ref ref="CONSOLE"/> - </root> - - -</log4j:configuration> diff --git a/backend/manager/modules/dal/src/test/resources/logging.properties b/backend/manager/modules/dal/src/test/resources/logging.properties new file mode 100644 index 0000000..1c8698a --- /dev/null +++ b/backend/manager/modules/dal/src/test/resources/logging.properties @@ -0,0 +1,15 @@ +# Default format of log line is: DATE TIME LEVEL [SOURCE] Message Stacktrace +java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS,%1$tL %4$-7s [%2$s] %5$s%6$s%n + +# Default logging level +.level=WARNING + +# Root handlers +handlers=java.util.logging.ConsoleHandler + +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter + +# Set appropriate log level per category +org.ovirt.engine.core.level=INFO +org.ovirt.engine.core.utils.ejb.EJBUtilsStrategy.level=SEVERE +org.ovirt.engine.core.dal.dbbroker.PostgresDbEngineDialect$PostgresJdbcTemplate.level=WARNING -- To view, visit http://gerrit.ovirt.org/34184 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8994411aaada821a0d4e1127c24cbcc6baf39696 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
