Fixes and tweaks to backups service

Author: d-shapiro

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/backup/SysBackupService.java

@@ -68,16 +68,17 @@ public ActionResult onInvoke(DSInfo action, ActionInvocation invocation) {
     }
 
     @Override
-    public void onSet(DSInfo info, DSIValue value) {
-        super.onSet(info, value);
+    public void onChildChanged(DSInfo info) {
+        super.onChildChanged(info);
         if (info == interval) {
+            DSIValue value = info.getValue();
             synchronized (lock) {
                 if (nextSave != null) {
                     long newNextRun = (value.toElement().toLong() * 60000) + System.currentTimeMillis();
                     long scheduledNextRun = nextSave.nextRun();
                     if (newNextRun < scheduledNextRun) {
                         nextSave.cancel();
-                        DSRuntime.runAt(this, newNextRun);
+                        nextSave = DSRuntime.runAt(this, newNextRun);
                     }
                 }
             }
@@ -215,5 +216,14 @@ public void run() {
             nextSave = DSRuntime.runDelayed(this, saveInterval);
         }
     }
+    
+    @Override
+    public void onStopped() {
+        if (nextSave != null) {
+            nextSave.cancel();
+            nextSave = null;
+        }
+        save();
+    }
 
 }

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

@@ -189,7 +189,6 @@ public static DSLink load(DSLinkConfig config) {
             } catch (Exception x) {
                 DSException.throwRuntime(x);
             }
-//            ret.save();
         }
         return ret;
     }
@@ -258,7 +257,6 @@ public void run() {
                 stop();
                 DSException.throwRuntime(x);
             }
-//            save();
             LogManager.getLogManager().reset();
             Logger logger = Logger.getLogger("");
             for (Handler h : logger.getLogger("").getHandlers()) {