From 58e829a30021e30d51e09fd085d16f6a701b6d98 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 18 Dec 2012 22:48:42 +1300
Subject: Fix logger

---
 src/org/traccar/Server.java     |  7 -------
 src/org/traccar/helper/Log.java | 11 +++++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/org')

diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index 2167a7933..07296d945 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -202,13 +202,6 @@ public class Server {
                     }
                 });
 
-                // Remove old logging handlers
-                Handler[] handlers = Logger.getLogger("").getHandlers();
-                for(Handler handler : handlers) {
-                    Logger.getLogger("").removeHandler(handler);
-                }
-                
-                Log.getLogger().setLevel(Level.ALL);
                 Log.getLogger().addHandler(file);
             }
         }
diff --git a/src/org/traccar/helper/Log.java b/src/org/traccar/helper/Log.java
index 03de36c46..983171b72 100644
--- a/src/org/traccar/helper/Log.java
+++ b/src/org/traccar/helper/Log.java
@@ -23,13 +23,20 @@ import java.util.logging.Logger;
  */
 public class Log {
     
-    private static String TRACCAR_LOGGER_NAME = "traccar";
+    private static final String TRACCAR_LOGGER_NAME = "traccar";
+    
+    private static Logger logger = null;
 
     /**
      * Return global logger
      */
     public static Logger getLogger() {
-        return Logger.getLogger(TRACCAR_LOGGER_NAME);
+        if (logger == null) {
+            logger = Logger.getLogger(TRACCAR_LOGGER_NAME);
+            logger.setUseParentHandlers(false);
+            logger.setLevel(Level.ALL);
+        }
+        return logger;
     }
     
     private static void write(Level level, String msg) {
-- 
cgit v1.2.3