0.64.0

- Log name changes.
- Log message changes.

Author: a-hansen

README.md

@@ -2,7 +2,7 @@
 [![](https://jitpack.io/v/iot-dsa-v2/sdk-dslink-java-v2.svg)](https://jitpack.io/#iot-dsa-v2/sdk-dslink-java-v2)
 
 * [Documentation](https://github.com/iot-dsa-v2/sdk-dslink-java-v2/wiki)
-* [Javadoc](https://jitpack.io/com/github/iot-dsa-v2/sdk-dslink-java-v2/dslink-v2/master-SNAPSHOT/javadoc/)
+* [Javadoc](https://jitpack.io/com/github/iot-dsa-v2/sdk-dslink-java-v2/dslink-v2-api/master-SNAPSHOT/javadoc/)
 * Java 8+
 
 

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.63.0'
+    version '0.64.0'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2-api/src/main/java/org/iot/dsa/conn/DSBaseConnection.java

@@ -94,7 +94,7 @@ protected boolean canConnect() {
             configOk();
             return true;
         } catch (Throwable x) {
-            error(error() ? getPath() : null, x);
+            debug(debug() ? getPath() : null, x);
             configFault(DSException.makeMessage(x));
         }
         return false;

dslink-v2-api/src/main/java/org/iot/dsa/conn/DSConnection.java

@@ -96,6 +96,7 @@ public void connDown(String reason) {
             put(stateTime, DSDateTime.now());
             notifyConnectedDescendants(this, this);
             super.connDown(reason);
+            info("Disconnected");
             try {
                 onDisconnected();
             } catch (Exception x) {
@@ -127,6 +128,7 @@ public void connOk() {
             put(stateTime, DSDateTime.valueOf(now));
             notifyConnectedDescendants(this, this);
             super.connOk();
+            info("Connected");
             try {
                 onConnected();
             } catch (Exception x) {
@@ -147,21 +149,18 @@ public void connect() {
             debug(debug() ? "Not disconnected, ignoring connect()" : null);
             return;
         }
+        if (!isEnabled() || !canConnect()) {
+            return;
+        }
         debug(debug() ? "Connect" : null);
         put(state, DSConnectionState.CONNECTING);
         put(stateTime, DSDateTime.now());
         notifyConnectedDescendants(this, this);
-        if (isEnabled() && canConnect()) {
-            try {
-                doConnect();
-            } catch (Throwable e) {
-                error(error() ? getPath() : null, e);
-                connDown(DSException.makeMessage(e));
-            }
-        } else {
-            put(state, DSConnectionState.DISCONNECTED);
-            put(stateTime, DSDateTime.now());
-            notifyConnectedDescendants(this, this);
+        try {
+            doConnect();
+        } catch (Throwable e) {
+            error(error() ? getPath() : null, e);
+            connDown(DSException.makeMessage(e));
         }
     }
 
@@ -170,7 +169,9 @@ public void connect() {
      * respective callbacks.
      */
     public void disconnect() {
-        debug(debug() ? "Disconnect" : null);
+        if (getConnectionState().isDisconnected()) {
+            return;
+        }
         put(state, DSConnectionState.DISCONNECTING);
         put(stateTime, DSDateTime.now());
         notifyConnectedDescendants(this, this);
@@ -184,6 +185,7 @@ public void disconnect() {
         notifyConnectedDescendants(this, this);
         down = true;
         updateStatus(null);
+        info("Disconnected");
         try {
             onDisconnected();
         } catch (Exception x) {

dslink-v2-api/src/main/java/org/iot/dsa/conn/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * All connection based links should use DSConnection or DSBaseConnection (rarely).
+ *
+ * @author Aaron Hansen
+ */
+package org.iot.dsa.conn;
+

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

@@ -8,7 +8,7 @@
 import org.iot.dsa.io.DSIReader;
 import org.iot.dsa.io.NodeDecoder;
 import org.iot.dsa.io.json.Json;
-import org.iot.dsa.logging.DSLogHandler;
+import org.iot.dsa.logging.DSLogger;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSPath;
 import org.iot.dsa.node.DSString;
@@ -115,18 +115,16 @@ public String getPathInBroker(DSNode node) {
      * @param config Configuration options
      */
     public static DSLink load(DSLinkOptions config) {
-        Logger logger = Logger.getLogger("");
         DSLink ret = null;
         File nodes = config.getNodesFile();
         if (nodes.exists()) {
-            logger.info("Loading node database " + nodes.getAbsolutePath());
             long time = System.currentTimeMillis();
             DSIReader reader = Json.reader(nodes);
             ret = (DSLink) NodeDecoder.decode(reader);
             reader.close();
             ret.init(config);
             time = System.currentTimeMillis() - time;
-            ret.info("Node database loaded: " + time + "ms");
+            ret.info("Database loaded: " + time + "ms");
         } else {
             String type = config.getConfig("linkType", null);
             if (type == null) {
@@ -135,7 +133,7 @@ public static DSLink load(DSLinkOptions config) {
             } else {
                 ret = (DSLink) DSUtil.newInstance(type);
             }
-            ret.info("Creating new node database...");
+            ret.debug("Creating new node database...");
             ret.init(config);
         }
         return ret;
@@ -170,27 +168,25 @@ public void run() {
             Class clazz = DSLink.class;
             try {
                 URL src = clazz.getProtectionDomain().getCodeSource().getLocation();
-                info(info() ? src : null);
+                info(src);
             } catch (Throwable t) {
-                debug("Reporting source of DSLink.class", t);
+                debug(null, t);
             }
             Runtime.getRuntime().addShutdownHook(new Thread() {
                 public void run() {
-                    info("Running shutdown hook");
                     shutdown();
                 }
             });
-            info(info() ? "Starting nodes" : null);
             start();
-            long stableDelay = options.getConfig(DSLinkOptions.CFG_STABLE_DELAY, 5000l);
+            long stableDelay = options.getConfig(DSLinkOptions.CFG_STABLE_DELAY, 2000l);
             try {
                 Thread.sleep(stableDelay);
             } catch (Exception x) {
-                debug("Interrupted stable delay", x);
+                debug(null, x);
             }
             try {
-                info(info() ? "Stabilizing nodes" : null);
                 stable();
+                info("Running");
                 while (isRunning()) {
                     synchronized (this) {
                         try {
@@ -257,7 +253,7 @@ protected String getMainName() {
      */
     protected DSLink init(DSLinkOptions config) {
         this.options = config;
-        DSLogHandler.setRootLevel(config.getLogLevel());
+        DSLogger.DSA.setLevel(config.getLogLevel());
         name = config.getLinkName();
         return this;
     }

dslink-v2-api/src/main/java/org/iot/dsa/io/DSBase64.java

@@ -8,6 +8,8 @@
  * Thread-safe Base64 encoder and decoder.  This only exists because we had to be compatible with
  * Java 6.  The one benefit of this is that is can decode url safe and unsafe without prior
  * knowledge of the encoding.
+ *
+ * @author Aaron Hansen
  */
 public class DSBase64 {
 
@@ -33,7 +35,7 @@ public class DSBase64 {
     ///////////////////////////////////////////////////////////
 
     /**
-     * Decodes a base 64 encoded string.  Will decodeKeys both url safe and unsafe.
+     * Decodes a base 64 encoded string.  Will decode both url safe and unsafe.
      *
      * @param str Most not be null.
      * @return Never null.

dslink-v2-api/src/main/java/org/iot/dsa/io/package-info.java

@@ -1,5 +1,6 @@
 /**
- * Node serialization and streaming abstraction for JSON and MsgPack.
+ * Node serialization and a streaming abstraction for JSON and MsgPack that uses the
+ * DSElement types.
  *
  * @author Aaron Hansen
  */

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

@@ -32,6 +32,7 @@ public class DSLogHandler extends Handler {
     private StringBuilder builder = new StringBuilder();
     private LogHandlerThread logHandlerThread;
     private int maxQueueSize = 2500;
+
     ///////////////////////////////////////////////////////////////////////////
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
@@ -91,6 +92,15 @@ public static Level getRootLevel() {
         return Logger.getLogger("").getLevel();
     }
 
+    /**
+     * Installs the root handler.
+     */
+    public static void init() {
+        if (root == null) {
+            root = Logger.getLogger("");
+        }
+    }
+
     /**
      * Enqueues the record for the write thread.
      */
@@ -172,11 +182,6 @@ public static void setRootLevel(Level level) {
             root = Logger.getLogger("");
         }
         root.setLevel(level);
-        /*
-        for (Handler h : root.getHandlers()) {
-            h.setLevel(level);
-        }
-        */
     }
 
     /**
@@ -387,14 +392,16 @@ record = null;
     ///////////////////////////////////////////////////////////////////////////
 
     static {
-        Logger rootLogger = Logger.getLogger("");
-        rootLevel = rootLogger.getLevel();
-        for (Handler handler : rootLogger.getHandlers()) {
-            rootLogger.removeHandler(handler);
+        if (root == null) {
+            root = Logger.getLogger("");
+        }
+        rootLevel = root.getLevel();
+        for (Handler handler : root.getHandlers()) {
+            root.removeHandler(handler);
         }
         DSLogHandler async = new DSLogHandler();
         async.setLevel(rootLevel);
-        rootLogger.addHandler(async);
+        root.addHandler(async);
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         pw.println();

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

@@ -60,6 +60,8 @@ public class DSLogger {
     public static final Level error = Level.SEVERE;
     public static final Level off = Level.OFF;
 
+    public static final Logger DSA = Logger.getLogger("dsa");
+
     /////////////////////////////////////////////////////////////////
     // Instance Fields
     /////////////////////////////////////////////////////////////////
@@ -149,6 +151,16 @@ public void error(Supplier<String> msg) {
         }
     }
 
+    /**
+     * Override point, returns the console logger by default.
+     */
+    public Logger getLogger() {
+        if (logger == null) {
+            logger = Logger.getLogger(getLogName());
+        }
+        return logger;
+    }
+
     /**
      * True if the level is loggable.
      */
@@ -280,17 +292,7 @@ public void warn(Supplier<String> msg) {
      * Override point, returns the simple class name by default.
      */
     protected String getLogName() {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * Override point, returns the console logger by default.
-     */
-    protected Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(getLogName());
-        }
-        return logger;
+        return "dsa";
     }
 
     protected void setLogger(Logger logger) {
@@ -308,5 +310,13 @@ private String string(Object obj) {
         return obj.toString();
     }
 
+    /////////////////////////////////////////////////////////////////
+    // Initialization
+    /////////////////////////////////////////////////////////////////
+
+    static {
+        DSLogHandler.init();
+    }
+
 
 }