[JRD-471] Update to new carbono-service-manager

carbono-io · Oct 1, 2015 · 69f7b79 · 69f7b79
1 parent 9a7e1d1
commit 69f7b79
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 133 deletions.
diff --git a/app/auth/index.js b/app/auth/index.js
@@ -3,7 +3,7 @@
 var passport = require('passport');
 var BearerStrategy = require('passport-http-bearer').Strategy;
 var helper = require('./lib/auth-server-wrapper');
-var etcd   = require('../../lib/etcd-manager');
+var etcd   = require('carbono-service-manager');
 
 module.exports = function (app) {
     app.use(passport.initialize());

diff --git a/app/controllers/infra.js b/app/controllers/infra.js
@@ -4,7 +4,7 @@ var CJM   = require('carbono-json-messages');
 var uuid  = require('node-uuid');
 var bo    = require('../lib/mission-control-bo');
 var pjson = require('../../package.json');
-var etcd  = require('../../lib/etcd-manager');
+var etcd  = require('carbono-service-manager');
 
 module.exports = function (app) {
 

diff --git a/app/controllers/project.js b/app/controllers/project.js
@@ -3,7 +3,7 @@
 var bo             = require('../lib/mission-control-bo');
 var uuid           = require('node-uuid');
 var AccountManager = require('../lib/AccountManagerHelper');
-var etcd           = require('../../lib/etcd-manager');
+var etcd           = require('carbono-service-manager');
 
 module.exports = function (app) {
     var RequestHelper = require('../lib/RequestHelper');

diff --git a/config/default.json b/config/default.json
@@ -8,7 +8,7 @@
         "port": 7892,
         "key" : "mc",
         "alias" : "Carbono Mission-Control",
-        "hosts" : [
+        "dependencies" : [
             {"key" : "dcm", "alias" : "Jardim DCM"},
             {"key" : "ipe", "alias" : "Mogno Ipê"},
             {"key" : "auth", "alias" : "Carbono OAuth2"},

diff --git a/index.js b/index.js
@@ -25,7 +25,7 @@ var server = app.listen(htPort, function () {
     var port = server.address().port;
     console.log('Mission-Control listening at http://%s:%s', host, port);
     // Service discovery and registration
-    require('./lib/etcd-manager');
+    require('carbono-service-manager');
 });
 
 module.exports = server;
diff --git a/lib/etcd-manager.js b/lib/etcd-manager.js
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "body-parser": "^1.13.3",
     "carbono-json-messages": "0.0.2",
-    "carbono-service-manager": "0.0.4",
+    "carbono-service-manager": "0.0.6",
     "colors": "^1.1.2",
     "config": "^1.15.0",
     "consign": "^0.1.1",