Clearing the DataStore before loading it's data from persistent storage

avoidwork · Jul 4, 2015 · d11c60a · d11c60a
1 parent c368df7
commit d11c60a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/lib/haro.es6.js b/lib/haro.es6.js
@@ -276,7 +276,7 @@ class Haro {
 	cmd (type, ...args) {
 		let defer = deferred();
 
-		if (!this.adapters[type]) {
+		if (!this.adapters[type] || !adapter[type]) {
 			defer.reject(new Error(type + " not configured for persistent storage"));
 		} else {
 			adapter[type].apply(this, [this].concat(args)).then(function (arg) {
@@ -448,6 +448,7 @@ class Haro {
 	}
 
 	load (type = "mongo") {
+		this.clear();
 		return this.cmd(type, "get");
 	}
 

diff --git a/lib/haro.js b/lib/haro.js
@@ -301,7 +301,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 			value: function cmd(type) {
 				var defer = deferred();
 
-				if (!this.adapters[type]) {
+				if (!this.adapters[type] || !adapter[type]) {
 					defer.reject(new Error(type + " not configured for persistent storage"));
 				} else {
 					for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -499,6 +499,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 			value: function load() {
 				var type = arguments[0] === undefined ? "mongo" : arguments[0];
 
+				this.clear();
 				return this.cmd(type, "get");
 			}
 		}, {