Martin Peřina has uploaded a new change for review. Change subject: tools: Replace log4j with slf4j as frontend in notifier ......................................................................
tools: Replace log4j with slf4j as frontend in notifier Replaces log4j with slf4j as logging frontend in classes which are used in notifier. Change-Id: Ibc192c7f10d7f9a124d2899118f6c5c7126b7230 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/notifier/EngineMonitorService.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilter.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java 7 files changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/33773/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index d33def3..358a6e9 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -27,7 +27,6 @@ import javax.net.ssl.X509TrustManager; import javax.sql.DataSource; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.notifier.utils.NotificationProperties; @@ -36,6 +35,8 @@ import org.ovirt.engine.core.utils.EngineLocalConfig; import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils; import org.ovirt.engine.core.utils.db.DbUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class uses to monitor the oVirt Engineanager service by sampling its health servlet. Upon response other than code 200, @@ -46,7 +47,7 @@ */ public class EngineMonitorService implements Runnable { - private static final Logger log = Logger.getLogger(EngineMonitorService.class); + private static final Logger log = LoggerFactory.getLogger(EngineMonitorService.class); private static final String ENGINE_NOT_RESPONDING_ERROR = "Engine server is not responding."; private static final String ENGINE_RESPONDING_MESSAGE = "Engine server is up and running."; private static final String HEALTH_SERVLET_PATH = "/services/health"; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java index 8ff7d54..451b0a4 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java @@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.EventNotificationMethod; import org.ovirt.engine.core.notifier.dao.EventsManager; import org.ovirt.engine.core.notifier.filter.AuditLogEvent; @@ -16,6 +15,8 @@ import org.ovirt.engine.core.notifier.transport.Transport; import org.ovirt.engine.core.notifier.utils.NotificationProperties; import org.ovirt.engine.core.notifier.utils.ShutdownHook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Responsible for an execution of the service for the current events in the system which should be notified to the @@ -25,7 +26,7 @@ public static final String FILTER = "FILTER"; - private static final Logger log = Logger.getLogger(NotificationService.class); + private static final Logger log = LoggerFactory.getLogger(NotificationService.class); private final NotificationProperties prop; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java index 947852c..ee12171 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java @@ -17,7 +17,6 @@ import javax.sql.DataSource; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.notifier.filter.AuditLogEvent; import org.ovirt.engine.core.notifier.filter.AuditLogEventType; @@ -28,12 +27,14 @@ import org.ovirt.engine.core.notifier.transport.Observer; import org.ovirt.engine.core.utils.db.StandaloneDataSource; import org.ovirt.engine.core.utils.db.DbUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EventsManager implements Observer { public static final String DATABASE_UNREACHABLE = "DATABASE_UNREACHABLE"; - private static final Logger log = Logger.getLogger(EventsManager.class); + private static final Logger log = LoggerFactory.getLogger(EventsManager.class); private DataSource ds; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilter.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilter.java index 888c752..a68efa6 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilter.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/filter/FirstMatchSimpleFilter.java @@ -10,8 +10,9 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.notifier.transport.Transport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FirstMatchSimpleFilter { @@ -32,7 +33,7 @@ "\\s*" + "" ); - private static final Logger log = Logger.getLogger(FirstMatchSimpleFilter.class); + private static final Logger log = LoggerFactory.getLogger(FirstMatchSimpleFilter.class); private Map<String, Transport> transports = new HashMap<>(); private List<FilterEntry> notify = new LinkedList<>(); private Set<Recipient> recipients = new HashSet<>(); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java index 6fe77c2..60e058a 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java @@ -19,12 +19,13 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.EventNotificationMethod; import org.ovirt.engine.core.notifier.dao.DispatchResult; import org.ovirt.engine.core.notifier.filter.AuditLogEvent; import org.ovirt.engine.core.notifier.transport.Transport; import org.ovirt.engine.core.notifier.utils.NotificationProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The class sends e-mails to event subscribers. @@ -55,7 +56,7 @@ private static final String MAIL_SEND_INTERVAL = "MAIL_SEND_INTERVAL"; private static final String MAIL_RETRIES = "MAIL_RETRIES"; - private static final Logger log = Logger.getLogger(Smtp.class); + private static final Logger log = LoggerFactory.getLogger(Smtp.class); private int retries; private int sendIntervals; private int lastSendInterval = 0; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java index 1001173..988487f 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java @@ -10,7 +10,6 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.EventNotificationMethod; import org.ovirt.engine.core.notifier.NotificationServiceException; @@ -18,6 +17,8 @@ import org.ovirt.engine.core.notifier.filter.AuditLogEvent; import org.ovirt.engine.core.notifier.transport.Transport; import org.ovirt.engine.core.notifier.utils.NotificationProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.snmp4j.CommunityTarget; import org.snmp4j.PDU; import org.snmp4j.mp.SnmpConstants; @@ -30,7 +31,7 @@ public class Snmp extends Transport { - private static final Logger log = Logger.getLogger(Snmp.class); + private static final Logger log = LoggerFactory.getLogger(Snmp.class); private static final String SNMP_MANAGERS = "SNMP_MANAGERS"; private static final String SNMP_COMMUNITY = "SNMP_COMMUNITY"; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java index 501c296..8964060 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java @@ -5,7 +5,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class designed to handle a proper shutdown in case of an external signal which was registered was caught by the @@ -13,7 +14,7 @@ */ public class ShutdownHook extends Thread { - private static final Logger log = Logger.getLogger(ShutdownHook.class); + private static final Logger log = LoggerFactory.getLogger(ShutdownHook.class); private List<ScheduledExecutorService> schedulers = new LinkedList<>(); private List<ScheduledFuture<?>> serviceHandlers = new LinkedList<>(); -- To view, visit http://gerrit.ovirt.org/33773 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc192c7f10d7f9a124d2899118f6c5c7126b7230 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
