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/database/LdapProvider.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/database/LdapProvider.java')

diff --git a/src/org/traccar/database/LdapProvider.java b/src/org/traccar/database/LdapProvider.java
index eb975ad0f..612abe055 100644
--- a/src/org/traccar/database/LdapProvider.java
+++ b/src/org/traccar/database/LdapProvider.java
@@ -23,14 +23,17 @@ import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.traccar.Config;
-import org.traccar.helper.Log;
 import org.traccar.model.User;
 
 import java.util.Hashtable;
 
 public class LdapProvider {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(LdapProvider.class);
+
     private String url;
     private String searchBase;
     private String idAttribute;
@@ -85,7 +88,7 @@ public class LdapProvider {
                 if (results.hasMoreElements()) {
                     results.nextElement();
                     if (results.hasMoreElements()) {
-                        Log.warning("Matched multiple users for the accountName: " + accountName);
+                        LOGGER.warn("Matched multiple users for the accountName: " + accountName);
                         return false;
                     }
                     return true;
@@ -117,7 +120,7 @@ public class LdapProvider {
         if (results.hasMoreElements()) {
             searchResult = results.nextElement();
             if (results.hasMoreElements()) {
-                Log.warning("Matched multiple users for the accountName: " + accountName);
+                LOGGER.warn("Matched multiple users for the accountName: " + accountName);
                 return null;
             }
         }
@@ -155,7 +158,7 @@ public class LdapProvider {
             user.setLogin(accountName);
             user.setName(accountName);
             user.setEmail(accountName);
-            Log.warning(e);
+            LOGGER.warn(null, e);
         }
         return user;
     }
-- 
cgit v1.2.3