GlobalRegistryConnector updated

Author: jboulmal

src/main/MsgNode.js

@@ -88,8 +88,9 @@ class MsgNode {
     this.app.get('/live', (req, res) => {
       res.send({
         status:'up',
-        domain : this.config.url,
+        domain: this.config.url,
         domainRegistry: this.config.domainRegistryUrl,
+        globalRegistry: this.config.globalRegistryUrl,
         time: (new Date()).toISOString(),
         connected: Object.keys(this.io.sockets.sockets).length
       });
@@ -121,7 +122,7 @@ class MsgNode {
     this.registry.registerComponent(olm);
     let syncm = new SubscriptionManager('domain://msg-node.' + this.registry.getDomain()  + '/sm', this.registry);
     this.registry.registerComponent(syncm);
-    let rm = new RegistryManager('domain://registry.' + this.registry.getDomain() + '/', this.registry);
+    let rm = new DomainRegistryManager('domain://registry.' + this.registry.getDomain() + '/', this.registry);
     this.registry.registerComponent(rm);
     let glbm = new GlobalRegistryManager(this.registry.getDomain().globalRegistryUrl, this.registry);
     this.registry.registerComponent(glbm);

src/main/components/rethink/GlobalRegistryManager.js

@@ -29,29 +29,34 @@ let JSRequest = require('./../../../modules/JSRequest');
 class GlobalRegistryManager {
 
   constructor(registryURL, registry) {
-    this.name = name;
     this.request = new JSRequest();
     this.registry = registry;
     this.registryURL = this.registry.getConfig().globalRegistryUrl;
     this.logger = this.registry.getLogger();
   }
 
+  getName() {
+    return this.name;
+  }
+
   processMessage(msg, callback) {
     // let msg = clientMessage.getMessage();
     let body = msg.getBody();
     this.logger.error(msg);
-    switch(msg.getType().toLowerCase()) {
-      try {
-            case 'create':
-            case 'update':
+    switch (msg.getType().toLowerCase()) {
+      case 'create':
+      case 'update':
+        try {
               if(typeof body.value !== 'undefined' && 'hypertyURL' in body.value) {
-                this.logger.info('[Gloabl-Registry-Manager] Add hyperty with :' body.value);
+                this.logger.info('[Gloabl-Registry-Manager] Add hyperty with :',  body.value);
                 this.addHyperty(body.value.user, body.value.hypertyURL, body.value.hypertyDescriptorURL, body.value.expires, callback);
               } else {
                 this.logger.info('[Global-Registry-Manager] Add data Object :' + body.value.name);
                 this.addDataObject(body.value.name, body.value.schema, body.value.expires, body.value.url, body.value.reporter, callback);
               }
-
+            } catch (e) {
+                this.logger.error('[global-Registry-Manager] [', this.getName(), ']: Error while processing message:\n', e);
+            }
             break;
 
             case 'delete':
@@ -75,13 +80,10 @@ class GlobalRegistryManager {
               }
 
             break;
-          } catch (e) {
-            this.logger.error('[global-Registry-Manager] [', this.getName(), ']: Error while processing message:\n', e);
-          }
 
-          break;
-          default:
-            clientMessage.replyError(this.getName(), 'Unrecognized type :"' + msg.getType() + '"');
+            break;
+            default:
+              clientMessage.replyError(this.getName(), 'Unrecognized type :"' + msg.getType() + '"');
     }
   }