Martin Peřina has uploaded a new change for review. Change subject: tools: Replaces log4j with JUL as backend for engine-config ......................................................................
tools: Replaces log4j with JUL as backend for engine-config Replaces log4j with java.util.logging as logging backend in engine-config. Change-Id: I2b340115f68cf88b6ebd3166044f974fed9e798b Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigExecutor.java M backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml D backend/manager/tools/src/main/resources/engine-config/log4j.xml M packaging/bin/engine-config.sh 4 files changed, 8 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/33757/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigExecutor.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigExecutor.java index 489b811..019617a 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigExecutor.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigExecutor.java @@ -1,36 +1,12 @@ package org.ovirt.engine.core.config; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import org.apache.log4j.Logger; -import org.ovirt.engine.core.utils.log.Log4jUtils; +import org.ovirt.engine.core.utils.log.JavaLoggingUtils; +import org.slf4j.LoggerFactory; /** * Parses command line arguments, setups logging and executes engine config */ public class EngineConfigExecutor { - public static void setupLogging(String log4jConfig, String logFile, String logLevel) { - URL cfgFileUrl = null; - try { - if (log4jConfig == null) { - cfgFileUrl = EngineConfigExecutor.class.getResource("/engine-config/log4j.xml"); - } else { - cfgFileUrl = new File(log4jConfig).toURI().toURL(); - } - Log4jUtils.setupLogging(cfgFileUrl); - } catch (MalformedURLException ex) { - throw new IllegalArgumentException( - String.format("Error loading log4j configuration from '%s': %s", cfgFileUrl, ex.getMessage()), - ex); - } - - if (logFile != null) { - Log4jUtils.addFileAppender(logFile, logLevel); - } - } - public static void main(String... args) { EngineConfigCLIParser parser = null; try { @@ -38,7 +14,9 @@ parser.parse(args); EngineConfigMap argsMap = parser.getEngineConfigMap(); - setupLogging(argsMap.getLog4jConfig(), argsMap.getLogFile(), argsMap.getLogLevel()); + if (argsMap.getLogFile() != null) { + JavaLoggingUtils.addFileHandler(argsMap.getLogFile(), argsMap.getLogLevel()); + } } catch (Throwable t) { System.out.println(t.getMessage()); System.exit(1); @@ -47,7 +25,7 @@ try { EngineConfig.getInstance().setUpAndExecute(parser); } catch (Throwable t) { - Logger.getLogger(EngineConfigExecutor.class).debug("Exiting with error: ", t); + LoggerFactory.getLogger(EngineConfigExecutor.class).debug("Exiting with error: ", t); System.out.println(t.getMessage()); System.exit(1); } diff --git a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml index 47de050..8b9d1bf 100644 --- a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml +++ b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml @@ -19,6 +19,7 @@ <module name="org.ovirt.engine.core.utils"/> <module name="org.ovirt.engine.core.uutils"/> <module name="org.postgresql"/> + <module name="org.slf4j"/> <module name="org.snmp4j"/> <module name="sun.jdk"/> </dependencies> diff --git a/backend/manager/tools/src/main/resources/engine-config/log4j.xml b/backend/manager/tools/src/main/resources/engine-config/log4j.xml deleted file mode 100644 index 7b0580b..0000000 --- a/backend/manager/tools/src/main/resources/engine-config/log4j.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - <appender name="null-appender" class="org.apache.log4j.varia.NullAppender" /> - <root> - <level value="DEBUG"/> - <!-- - We need this, because log4j writes warning messages to stderr - if no appender is configured and we add appender only if proper - command line argument is specified. - --> - <appender-ref ref="null-appender" /> - </root> -</log4j:configuration> diff --git a/packaging/bin/engine-config.sh b/packaging/bin/engine-config.sh index 08e7c46..a26bdb2 100755 --- a/packaging/bin/engine-config.sh +++ b/packaging/bin/engine-config.sh @@ -110,6 +110,7 @@ # exec "${JAVA_HOME}/bin/java" \ + -Djava.util.logging.config.file=${OVIRT_LOGGING_PROPERTIES} \ -Djboss.modules.write-indexes=false \ -jar "${JBOSS_HOME}/jboss-modules.jar" \ -dependencies org.ovirt.engine.core.tools \ -- To view, visit http://gerrit.ovirt.org/33757 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b340115f68cf88b6ebd3166044f974fed9e798b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
