Juan Hernandez has uploaded a new change for review. Change subject: tools: Revert custom log4j configuration ......................................................................
tools: Revert custom log4j configuration The following changes have been introduced to perform a custom log4j configuration to overcome the limitations introduced by the modified log4j module introduced with JBoss AS 7.2 (which corresponds to JBoss EAP 6.1): 00b873eb8af8107cfa2526e1e09016638deb11cb tools: Fix engine-manage-domains logging config 36454e3a249179346e78f66ac8731ef6e293a4c3 tools: Fix engine-config logging config a419ef33bec3add4406132beb319b506110b1f01 tools: Fix ovirt-engine-notifier logging This issue has been resolved changing the tools to use an unmodified version of log4j, so this custom configuration is no longer needed. Change-Id: I0be490d6635fa10c3434af9618cd5d1758fdc6ed Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java 3 files changed, 0 insertions(+), 70 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/18225/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java index 1a3b419..c3b35bb 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfig.java @@ -1,15 +1,8 @@ package org.ovirt.engine.core.config; import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.parsers.FactoryConfigurationError; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import org.apache.log4j.xml.DOMConfigurator; import org.ovirt.engine.core.config.validation.ConfigActionType; import org.ovirt.engine.core.tools.ToolConsole; import org.ovirt.engine.core.utils.EngineLocalConfig; @@ -52,29 +45,12 @@ } /** - * Initializes logging configuration - */ - private static void initLogging() { - String cfgFile = System.getProperty("log4j.configuration"); - if (StringUtils.isNotBlank(cfgFile)) { - try { - URL url = new URL(cfgFile); - LogManager.resetConfiguration(); - DOMConfigurator.configure(url); - } catch (FactoryConfigurationError | MalformedURLException ex) { - System.out.println("Cannot configure logging: " + ex.getMessage()); - } - } - } - - /** * The main method, instantiates the parser and executes. * * @param args * The arguments given by the user. */ public static void main(String... args) { - initLogging(); try { getInstance().setParser(new EngineConfigCLIParser()); getInstance().setUpAndExecute(args); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index 174deda..4328b43 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -12,8 +12,6 @@ import java.io.FileReader; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -27,13 +25,9 @@ import java.util.Set; import java.util.TreeSet; -import javax.xml.parsers.FactoryConfigurationError; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import org.apache.log4j.xml.DOMConfigurator; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.ldap.LdapProviderType; @@ -162,25 +156,7 @@ } } - /** - * Initializes logging configuration - */ - private static void initLogging() { - String cfgFile = System.getProperty("log4j.configuration"); - if (StringUtils.isNotBlank(cfgFile)) { - try { - URL url = new URL(cfgFile); - LogManager.resetConfiguration(); - DOMConfigurator.configure(url); - } catch (FactoryConfigurationError | MalformedURLException ex) { - System.out.println("Cannot configure logging: " + ex.getMessage()); - } - } - } - public static void main(String[] args) { - initLogging(); - ManageDomains util; util = new ManageDomains(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java index dff895d..5972e6a 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java @@ -1,8 +1,6 @@ package org.ovirt.engine.core.notifier; import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executors; @@ -11,12 +9,9 @@ import java.util.concurrent.TimeUnit; import javax.mail.internet.InternetAddress; -import javax.xml.parsers.FactoryConfigurationError; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.LogManager; import org.apache.log4j.Logger; -import org.apache.log4j.xml.DOMConfigurator; import org.ovirt.engine.core.notifier.utils.NotificationProperties; import sun.misc.Signal; @@ -33,27 +28,10 @@ private static ScheduledExecutorService monitorScheduler = Executors.newSingleThreadScheduledExecutor(); /** - * Initializes logging configuration - */ - private static void initLogging() { - String cfgFile = System.getProperty("log4j.configuration"); - if (StringUtils.isNotBlank(cfgFile)) { - try { - URL url = new URL(cfgFile); - LogManager.resetConfiguration(); - DOMConfigurator.configure(url); - } catch (FactoryConfigurationError | MalformedURLException ex) { - System.out.println("Cannot configure logging: " + ex.getMessage()); - } - } - } - - /** * @param args * [0] configuration file absolute path */ public static void main(String[] args) { - initLogging(); NotifierSignalHandler handler = new NotifierSignalHandler(); Signal.handle(new Signal("HUP"), handler); handler.addScheduledExecutorService(notifyScheduler); -- To view, visit http://gerrit.ovirt.org/18225 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0be490d6635fa10c3434af9618cd5d1758fdc6ed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
