Martin Peřina has uploaded a new change for review. Change subject: tools: Replaces log4j with JUL as backend for manage-domains ......................................................................
tools: Replaces log4j with JUL as backend for manage-domains Replaces log4j with java.util.logging as logging backend in engine-manage-domains. Change-Id: I16afc336c26615978392f7d4ff911bf646c42df6 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java D backend/manager/modules/builtin-extensions/src/main/resources/engine-manage-domains/log4j.xml M backend/manager/modules/utils/pom.xml D backend/manager/modules/utils/src/main/resources/engine-manage-domains/log4j.xml 4 files changed, 4 insertions(+), 86 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/32853/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java index 83ec783..e331c29 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsExecutor.java @@ -5,45 +5,25 @@ import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG_FILE; import static org.ovirt.engine.extensions.aaa.builtin.tools.ManageDomainsArguments.ARG_LOG_LEVEL; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import org.apache.log4j.helpers.LogLog; -import org.ovirt.engine.core.utils.log.Log4jUtils; +import org.ovirt.engine.core.utils.log.JavaLoggingUtils; /** * Parses command line arguments, setups logging and executes engine-manage-domains */ public class ManageDomainsExecutor { - public static void setupLogging(String log4jConfig, String logFile, String logLevel) { - URL cfgFileUrl = null; - try { - if (log4jConfig == null) { - cfgFileUrl = ManageDomainsExecutor.class.getResource("/engine-manage-domains/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); - } + public static void setupLogging(String configFile, String logFile, String logLevel) { + JavaLoggingUtils.setupLogging(configFile); if (logFile != null) { - Log4jUtils.addFileAppender(logFile, logLevel); + JavaLoggingUtils.addFileHandler(logFile, logLevel); } } public static void main(String... args) { ManageDomainsArguments mdArgs = null; try { - // suppress displaying log4j warnings due to accessing logs when parsing params - LogLog.setQuietMode(true); mdArgs = new ManageDomainsArguments(); mdArgs.parse(args); - LogLog.setQuietMode(false); setupLogging(mdArgs.get(ARG_LOG4J_CONFIG), mdArgs.get(ARG_LOG_FILE), mdArgs.get(ARG_LOG_LEVEL)); } catch (Throwable t) { diff --git a/backend/manager/modules/builtin-extensions/src/main/resources/engine-manage-domains/log4j.xml b/backend/manager/modules/builtin-extensions/src/main/resources/engine-manage-domains/log4j.xml deleted file mode 100644 index 7b0580b..0000000 --- a/backend/manager/modules/builtin-extensions/src/main/resources/engine-manage-domains/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/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index 6cea3bf..23fbf7f 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -161,14 +161,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <excludes> - <exclude>engine-manage-domains/log4j.xml</exclude> - </excludes> - </resource> - </resources> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> diff --git a/backend/manager/modules/utils/src/main/resources/engine-manage-domains/log4j.xml b/backend/manager/modules/utils/src/main/resources/engine-manage-domains/log4j.xml deleted file mode 100644 index cb27d05..0000000 --- a/backend/manager/modules/utils/src/main/resources/engine-manage-domains/log4j.xml +++ /dev/null @@ -1,38 +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 --> - <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="/var/log/ovirt-engine/engine-manage-domains.log" /> - <param name="Append" value="true" /> - <param name="MaxFileSize" value="1500KB" /> - <param name="MaxBackupIndex" value="1" /> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n" /> - <!-- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> --> - - </layout> - </appender> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <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 %-5p [%c] (%t) %m%n" /> - </layout> - </appender> - - <category name="org.ovirt.engine.core.utils.kerberos"> - <priority value="INFO"/> - </category> - - <root> - <priority value="INFO" /> - <!-- appender-ref ref="CONSOLE" /--> - <appender-ref ref="FILE" /> - </root> - -</log4j:configuration> - -- To view, visit http://gerrit.ovirt.org/32853 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16afc336c26615978392f7d4ff911bf646c42df6 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
