fix

happner · Aug 4, 2017 · 74ab145 · 74ab145
1 parent b3df009
commit 74ab145
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -48,12 +48,15 @@ var config = {
             //  }
             //},
 
-            // defaulted by happner-cluster to prevent description overwrites in shared db
+            // defaulted by happner-cluster to prevent overwrites in shared db
+            // where each cluster server requires unique data at certain paths
             //{
             //  name: 'nedb-own-schema',
             //  settings: {},
             //  patterns: [
-            //    '/mesh/schema/*'
+            //    '/mesh/schema/*',
+            //    '/_SYSTEM/_NETWORK/_SETTINGS/NAME',
+            //    '/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR'
             //  ]
             //}
           ]

diff --git a/RELEASES.md b/RELEASES.md
@@ -9,7 +9,7 @@
   - onward release of happn-cluster
   - onward release of happner-2
   - onward release of happner-client
-  
+
 1.4.2 2017-04-19
 ----------------
   - onward release of happner-2
@@ -18,3 +18,7 @@
 ----------------
   - updated happner-2 to 3.0.0
   - start happn-cluster proxy (through which client access cluster) after component startMethods are run
+
+2.0.1 2017-08-04
+----------------
+  - add `/_SYSTEM/_NETWORK/_SETTINGS/NAME` and `/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR` to local storage (nedb, non-shared)
diff --git a/lib/nedb.js b/lib/nedb.js
@@ -6,7 +6,18 @@ module.exports.gotConfig = function (config) {
   var present = false;
   config.happn.services.data.config.datastores.forEach(function (ds) {
     if (!ds.patterns) return;
+
+    // use /nesh/schema to spot the nedb datastore
     if (ds.patterns.indexOf('/mesh/schema/*') >= 0) {
+
+      if (ds.patterns.indexOf('/_SYSTEM/_NETWORK/_SETTINGS/NAME') < 0) {
+        ds.patterns.push('/_SYSTEM/_NETWORK/_SETTINGS/NAME');
+      }
+
+      if (ds.patterns.indexOf('/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR') < 0) {
+        ds.patterns.push('/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR');
+      }
+
       present = true;
     }
   });
@@ -22,7 +33,9 @@ module.exports.addConfig = function (config) {
     name: 'nedb-own-schema',
     settings: {},
     patterns: [
-      '/mesh/schema/*'
+      '/mesh/schema/*',
+      '/_SYSTEM/_NETWORK/_SETTINGS/NAME',
+      '/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR'
     ]
   });
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "happner-cluster",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Extends happner with clustering capabilities",
   "main": "index.js",
   "scripts": {

diff --git a/test/unit/01-unit-cluster-create.js b/test/unit/01-unit-cluster-create.js
@@ -85,4 +85,78 @@ describe('01 - unit - cluster create', function () {
     HappnerCluster.create({});
   });
 
+  it('assigns private nedb datastore config if missing', function (done) {
+    Happner.create = function (config) {
+      expect(config.happn.services.data.config.datastores).to.eql([{
+        name: 'nedb-own-schema',
+        settings: {},
+        patterns: ['/mesh/schema/*',
+          '/_SYSTEM/_NETWORK/_SETTINGS/NAME',
+          '/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR'
+        ]
+      }]);
+      return Promise.resolve({
+        _mesh: {
+          happn: {
+            server: {
+              services: {
+                proxy: {
+                  start: function () {
+                    done();
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+    };
+
+    HappnerCluster.create({});
+  });
+
+  it('it ammends private nedb datastore config if missing entries', function (done) {
+    Happner.create = function (config) {
+      expect(config.happn.services.data.config.datastores).to.eql([{
+        name: 'alternative-name',
+        settings: {},
+        patterns: ['/mesh/schema/*',
+          '/_SYSTEM/_NETWORK/_SETTINGS/NAME',
+          '/_SYSTEM/_SECURITY/_SETTINGS/KEYPAIR'
+        ]
+      }]);
+      return Promise.resolve({
+        _mesh: {
+          happn: {
+            server: {
+              services: {
+                proxy: {
+                  start: function () {
+                    done();
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+    };
+
+    HappnerCluster.create({
+      happn: {
+        services: {
+          data: {
+            config: {
+              datastores: [{
+                name: 'alternative-name',
+                settings: {},
+                patterns: ['/mesh/schema/*']
+              }]
+            }
+          }
+        }
+      }
+    })
+  })
+
 });