Fix local datastore heartbeat

Author: sderrow

es5.js

@@ -1786,7 +1786,11 @@
 
 	      var base;
 
-	      if (this.heartbeat == null && (this.storeOptions.reservoirRefreshInterval != null && this.storeOptions.reservoirRefreshAmount != null || this.storeOptions.reservoirIncreaseInterval != null && this.storeOptions.reservoirIncreaseAmount != null)) {
+	      if (this.heartbeat != null) {
+	        clearInterval(this.heartbeat);
+	      }
+
+	      if (this.storeOptions.reservoirRefreshInterval != null && this.storeOptions.reservoirRefreshAmount != null || this.storeOptions.reservoirIncreaseInterval != null && this.storeOptions.reservoirIncreaseAmount != null) {
 	        return typeof (base = this.heartbeat = setInterval(function () {
 	          var amount, incr, maximum, now, reservoir;
 	          now = Date.now();
@@ -1812,8 +1816,6 @@
 	            }
 	          }
 	        }, this.heartbeatInterval)).unref === "function" ? base.unref() : void 0;
-	      } else {
-	        return clearInterval(this.heartbeat);
 	      }
 	    }
 	  }, {

lib/LocalDatastore.js

@@ -26,7 +26,11 @@ LocalDatastore = class LocalDatastore {
   _startHeartbeat() {
     var base;
 
-    if (this.heartbeat == null && (this.storeOptions.reservoirRefreshInterval != null && this.storeOptions.reservoirRefreshAmount != null || this.storeOptions.reservoirIncreaseInterval != null && this.storeOptions.reservoirIncreaseAmount != null)) {
+    if (this.heartbeat != null) {
+      clearInterval(this.heartbeat);
+    }
+
+    if (this.storeOptions.reservoirRefreshInterval != null && this.storeOptions.reservoirRefreshAmount != null || this.storeOptions.reservoirIncreaseInterval != null && this.storeOptions.reservoirIncreaseAmount != null) {
       return typeof (base = this.heartbeat = setInterval(() => {
         var amount, incr, maximum, now, reservoir;
         now = Date.now();
@@ -52,8 +56,6 @@ LocalDatastore = class LocalDatastore {
           }
         }
       }, this.heartbeatInterval)).unref === "function" ? base.unref() : void 0;
-    } else {
-      return clearInterval(this.heartbeat);
     }
   }
 

light.js

@@ -477,7 +477,10 @@
 
 	  _startHeartbeat() {
 	    var base;
-	    if ((this.heartbeat == null) && (((this.storeOptions.reservoirRefreshInterval != null) && (this.storeOptions.reservoirRefreshAmount != null)) || ((this.storeOptions.reservoirIncreaseInterval != null) && (this.storeOptions.reservoirIncreaseAmount != null)))) {
+	    if (this.heartbeat != null) {
+	      clearInterval(this.heartbeat);
+	    }
+	    if (((this.storeOptions.reservoirRefreshInterval != null) && (this.storeOptions.reservoirRefreshAmount != null)) || ((this.storeOptions.reservoirIncreaseInterval != null) && (this.storeOptions.reservoirIncreaseAmount != null))) {
 	      return typeof (base = (this.heartbeat = setInterval(() => {
 	        var amount, incr, maximum, now, reservoir;
 	        now = Date.now();
@@ -500,8 +503,6 @@
 	          }
 	        }
 	      }, this.heartbeatInterval))).unref === "function" ? base.unref() : void 0;
-	    } else {
-	      return clearInterval(this.heartbeat);
 	    }
 	  }
 

src/LocalDatastore.coffee

@@ -14,7 +14,9 @@ class LocalDatastore
     @_startHeartbeat()
 
   _startHeartbeat: ->
-    if !@heartbeat? and ((
+    if @heartbeat? then clearInterval @heartbeat
+
+    if ((
       @storeOptions.reservoirRefreshInterval? and @storeOptions.reservoirRefreshAmount?
     ) or (
       @storeOptions.reservoirIncreaseInterval? and @storeOptions.reservoirIncreaseAmount?
@@ -36,7 +38,6 @@ class LocalDatastore
               @instance._drainAll @computeCapacity()
 
         , @heartbeatInterval).unref?()
-    else clearInterval @heartbeat
 
   __publish__: (message) ->
     await @yieldLoop()