Merge pull request electrode-io#8 from xchen11/develop

add service registry provider
datvong-wm · Dec 19, 2015 · db74175 · db74175
2 parents 410902c + 60587a9
commit db74175
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/lib/config/default.js b/lib/config/default.js
@@ -6,7 +6,17 @@ module.exports = {
   server: {
     app: {
       electrode: true,
-      config: {}
+      config: {
+        services: {
+          env: "",
+          providers: {
+            registry: {
+              module: "@walmart/service-registry-client",
+              autoInit: true
+            }
+          }
+        }
+      }
     }
   },
   connections: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@walmart/electrode-server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A configurable Hapi web server",
   "main": "lib/index.js",
   "scripts": {
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@walmart/electrode-service-initializer": "^1.0.0",
+    "@walmart/service-registry-client": "^1.0.0",
     "bluebird": "^3.0.6",
     "chalk": "^1.1.1",
     "crumb": "^5.0.0",

diff --git a/test/server-test.js b/test/server-test.js
@@ -106,7 +106,12 @@ describe("electrode-server", function () {
   });
 
   it("should start up with a good @empty_config", function (done) {
+    const verifyServices = (server) => {
+      chai.assert(server.app.services.registry, "registry service is not present in server.app");
+      return server;
+    };
     electrodeServer("./test/data/empty-config.js")
+      .then(verifyServices)
       .then(stopServer)
       .then(() => done())
       .catch(done);