0.30.0

Logging

Author: a-hansen

build.gradle

@@ -4,7 +4,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.29.0'
+    version '0.30.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6

dslink-v2/src/main/java/org/iot/dsa/DSThreadPool.java

@@ -2,7 +2,7 @@
 
 import java.util.LinkedList;
 import java.util.logging.Level;
-import org.iot.dsa.logging.DSLogging;
+import java.util.logging.Logger;
 import org.iot.dsa.time.DSTime;
 
 /**
@@ -213,7 +213,7 @@ public void run() {
                         try {
                             r.run();
                         } catch (Exception x) {
-                            DSLogging.getDefaultLogger().log(Level.FINER, r.toString(), x);
+                            Logger.getLogger("").log(Level.FINER, r.toString(), x);
                         }
                         r = null;
                     }

dslink-v2/src/main/java/org/iot/dsa/dslink/DSLink.java

@@ -1,17 +1,24 @@
 package org.iot.dsa.dslink;
 
-import java.io.*;
+import org.iot.dsa.logging.DSLogHandler;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import org.iot.dsa.io.NodeDecoder;
 import org.iot.dsa.io.NodeEncoder;
 import org.iot.dsa.io.json.JsonReader;
 import org.iot.dsa.io.json.JsonWriter;
-import org.iot.dsa.logging.DSLogging;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.security.DSKeys;
@@ -136,7 +143,7 @@ public DSSysNode getSys() {
      */
     protected DSLink init(DSLinkConfig config) {
         this.config = config;
-        DSLogging.setDefaultLevel(config.getLogLevel());
+        DSLogHandler.setRootLevel(config.getLogLevel());
         name = config.getLinkName();
         keys = config.getKeys();
         getSys().init();
@@ -149,7 +156,7 @@ protected DSLink init(DSLinkConfig config) {
      * @param config Configuration options
      */
     public static DSLink load(DSLinkConfig config) {
-        Logger logger = DSLogging.getDefaultLogger();
+        Logger logger = Logger.getLogger("");
         DSLink ret = null;
         File nodes = config.getNodesFile();
         if (nodes.exists()) {
@@ -259,7 +266,11 @@ public void run() {
                 DSException.throwRuntime(x);
             }
             save();
-            DSLogging.close();
+            LogManager.getLogManager().reset();
+            Logger logger = Logger.getLogger("");
+            for (Handler h : logger.getLogger("").getHandlers()) {
+                h.close();
+            }
         } finally {
             runThread = null;
         }

dslink-v2/src/main/java/org/iot/dsa/logging/DSILevels.java

@@ -2,6 +2,9 @@
 
 import java.util.logging.Level;
 
+/**
+ * The DSA logging levels.
+ */
 public interface DSILevels {
 
     int TRACE = 300; //finest