Martin Peřina has uploaded a new change for review. Change subject: tools: Replaces log4j with JUL as backend for notifier ......................................................................
tools: Replaces log4j with JUL as backend for notifier Replaces log4j with java.util.logging as logging backend in notifier. Change-Id: I10216f8530e23c43942cdf28fe2cb306d7e6df71 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M .gitignore M Makefile M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/Notifier.java M ovirt-engine.spec.in D packaging/etc/notifier/log4j.xml.in A packaging/etc/notifier/logging.properties.in M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py 7 files changed, 21 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/33774/1 diff --git a/.gitignore b/.gitignore index 6c9bd1b..7b9f430 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,7 @@ packaging/etc/engine-manage-domains/engine-manage-domains.conf packaging/etc/engine-manage-domains/log4j.xml packaging/etc/engine.conf.d/README -packaging/etc/notifier/log4j.xml +packaging/etc/notifier/logging.properties packaging/etc/notifier/notifier.conf.d/README packaging/etc/ovirt-fence-kdump-listener.conf.d/README packaging/etc/ovirt-websocket-proxy.conf.d/README diff --git a/Makefile b/Makefile index c87a089..24478f2 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ packaging/bin/pki-common.sh \ packaging/etc/engine-manage-domains/engine-manage-domains.conf \ packaging/etc/engine.conf.d/README \ - packaging/etc/notifier/log4j.xml \ + packaging/etc/notifier/logging.properties \ packaging/etc/notifier/notifier.conf.d/README \ packaging/etc/ovirt-fence-kdump-listener.conf.d/README \ packaging/etc/ovirt-websocket-proxy.conf.d/README \ 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 3adf914..10a688f4b 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,44 +1,21 @@ package org.ovirt.engine.core.notifier; -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.notifier.transport.smtp.Smtp; import org.ovirt.engine.core.notifier.transport.snmp.Snmp; import org.ovirt.engine.core.notifier.utils.NotificationProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Main class of event notification service. Initiate the service and handles termination signals */ public class Notifier { - private static final Logger log = Logger.getLogger(Notifier.class); + private static final Logger log = LoggerFactory.getLogger(Notifier.class); /** * Command line argument, that tells Notifier to validate properties only (it exits after validation) */ private static final String ARG_VALIDATE = "validate"; - - /** - * 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 @@ -47,7 +24,6 @@ */ public static void main(String[] args) { NotificationProperties prop = null; - initLogging(); NotificationService notificationService = null; EngineMonitorService engineMonitorService = null; diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index c4183a9..91117f4 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -1049,7 +1049,7 @@ %files tools -f .mfiles-tools %config %{_sysconfdir}/logrotate.d/ovirt-engine-notifier -%config %{engine_etc}/notifier/log4j.xml +%config %{engine_etc}/notifier/logging.properties %config(noreplace) %{engine_etc}/engine-config/engine-config.conf %config(noreplace) %{engine_etc}/engine-manage-domains/engine-manage-domains.conf %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_log}/notifier diff --git a/packaging/etc/notifier/log4j.xml.in b/packaging/etc/notifier/log4j.xml.in deleted file mode 100644 index 74eb1d1..0000000 --- a/packaging/etc/notifier/log4j.xml.in +++ /dev/null @@ -1,32 +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.FileAppender"> - <param name="File" value="@ENGINE_LOG@/notifier/notifier.log" /> - <param name="Append" value="true" /> - - <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> - - <root> - <priority value="INFO" /> - <!-- appender-ref ref="CONSOLE" /--> - <appender-ref ref="FILE" /> - </root> - -</log4j:configuration> - diff --git a/packaging/etc/notifier/logging.properties.in b/packaging/etc/notifier/logging.properties.in new file mode 100644 index 0000000..1da84a2 --- /dev/null +++ b/packaging/etc/notifier/logging.properties.in @@ -0,0 +1,11 @@ +# Root logging level, it can be changed for each logger +.level=INFO + +# 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$-5s [%2$s] %5$s%6$s%n + +# Default logging file +handlers=java.util.logging.FileHandler +java.util.logging.FileHandler.append=true +java.util.logging.FileHandler.pattern=@ENGINE_LOG@/notifier/notifier.log +java.util.logging.FileHandler.formatter=org.ovirt.engine.core.utils.log.JavaLoggingFormatter diff --git a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py index 49de95b9..699cc94 100755 --- a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py +++ b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py @@ -135,7 +135,10 @@ # The name of the process, as displayed by ps: 'ovirt-engine-notifier', - '-Dlog4j.configuration=file://%s/notifier/log4j.xml' % ( + ( + '-Djava.util.logging.config.file=%s/notifier/' + 'logging.properties' + ) % ( self._config.get('ENGINE_ETC'), ), '-Djboss.modules.write-indexes=false', -- To view, visit http://gerrit.ovirt.org/33774 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10216f8530e23c43942cdf28fe2cb306d7e6df71 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
