From b10824bb5769c4abb93e3451673b88efdfb9d467 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 14 Sep 2018 14:33:49 +1200
Subject: Log using slf4j and java logging

---
 src/org/traccar/notificators/Notificator.java     |  7 +++++--
 src/org/traccar/notificators/NotificatorMail.java |  7 +++++--
 src/org/traccar/notificators/NotificatorNull.java | 10 +++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar/notificators')

diff --git a/src/org/traccar/notificators/Notificator.java b/src/org/traccar/notificators/Notificator.java
index de9817c9f..c3fad1607 100644
--- a/src/org/traccar/notificators/Notificator.java
+++ b/src/org/traccar/notificators/Notificator.java
@@ -16,20 +16,23 @@
  */
 package org.traccar.notificators;
 
-import org.traccar.helper.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.notification.MessageException;
 
 public abstract class Notificator {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Notificator.class);
+
     public void sendAsync(final long userId, final Event event, final Position position) {
         new Thread(new Runnable() {
             public void run() {
                 try {
                     sendSync(userId, event, position);
                 } catch (MessageException | InterruptedException error) {
-                    Log.warning(error);
+                    LOGGER.warn(null, error);
                 }
             }
         }).start();
diff --git a/src/org/traccar/notificators/NotificatorMail.java b/src/org/traccar/notificators/NotificatorMail.java
index cf786ffc4..7aa1a2968 100644
--- a/src/org/traccar/notificators/NotificatorMail.java
+++ b/src/org/traccar/notificators/NotificatorMail.java
@@ -26,8 +26,9 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import java.util.Date;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.traccar.Context;
-import org.traccar.helper.Log;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.model.User;
@@ -38,6 +39,8 @@ import org.traccar.notification.PropertiesProvider;
 
 public final class NotificatorMail extends Notificator {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorMail.class);
+
     private static Properties getProperties(PropertiesProvider provider) {
         Properties properties = new Properties();
         String host = provider.getString("mail.smtp.host");
@@ -97,7 +100,7 @@ public final class NotificatorMail extends Notificator {
             properties = getProperties(new PropertiesProvider(Context.getConfig()));
         }
         if (!properties.containsKey("mail.smtp.host")) {
-            Log.warning("No SMTP configuration found");
+            LOGGER.warn("No SMTP configuration found");
             return;
         }
 
diff --git a/src/org/traccar/notificators/NotificatorNull.java b/src/org/traccar/notificators/NotificatorNull.java
index 2120cda0c..9364336be 100644
--- a/src/org/traccar/notificators/NotificatorNull.java
+++ b/src/org/traccar/notificators/NotificatorNull.java
@@ -16,19 +16,23 @@
  */
 package org.traccar.notificators;
 
-import org.traccar.helper.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public final class NotificatorNull extends Notificator {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(NotificatorNull.class);
+
     @Override
     public void sendAsync(long userId, Event event, Position position) {
-        Log.warning("You are using null notificatior, please check your configuration, notification not sent");
+        LOGGER.warn("You are using null notificatior, please check your configuration, notification not sent");
     }
 
     @Override
     public void sendSync(long userId, Event event, Position position) {
-        Log.warning("You are using null notificatior, please check your configuration, notification not sent");
+        LOGGER.warn("You are using null notificatior, please check your configuration, notification not sent");
     }
+
 }
-- 
cgit v1.2.3