new storage rpc

jobworker/worker.js

@@ -6,6 +6,7 @@ var QueueReceiver = ctx.getLib('lib/amqp/queuereceiver');
 var ConnCtx = ctx.getLib('lib/conn/connection-context');
 var JobRegistry = ctx.getLib('lib/mems/job-registry');
 var SSCaller = ctx.getLib('lib/axon/rpccaller');
+var RPCCaller = ctx.getLib('lib/amqp/rpccaller');
 var ACLValidator = ctx.getLib('lib/auth/acl-validator');
 
 var JobTransaction = require('./lib/jobtransaction')
@@ -34,7 +35,10 @@ var JW = function JobWorker (prm)
 
   /* Disable RPC Feature */
   //this.storagecaller = new SSCaller({'url':SS_URL});
-  this.storagecaller = null;
+  this.storagecaller = new RPCCaller({
+    url : this.conn.getAmqpUrl(),
+    name :'storage_request'
+  });
 }
 
 JW.prototype.start = function ()

lib/amqp/rpccaller.js

@@ -27,7 +27,7 @@ function RPCCaller(config)
         ch.responseEmitter = new EventEmitter();
         ch.responseEmitter.setMaxListeners(0);
         ch.consume(REPLY_QUEUE ,
-          (msg) => { console.log(msg); ch.responseEmitter.emit(msg.properties.correlationId, JSON.parse(msg.content.toString()))},
+          (msg) => { ch.responseEmitter.emit(msg.properties.correlationId, JSON.parse(msg.content.toString()))},
           {noAck: true});
 
         self.opened = true;

plugins/do/do-storage/perform.js

@@ -24,10 +24,12 @@ function perform_function(context,request,response){
   var amqp_cfg = ctx.config.amqp;
   var storage_name = param.storage_name;
 
-  var caller = new RPCCaller({
-    url : amqp_cfg.url,
-    name :'storage_request'
-  });
+  // var caller = new RPCCaller({
+  //   url : amqp_cfg.url,
+  //   name :'storage_request'
+  // });
+
+  var caller = storagecaller;
 
   // if(param.channel!='ipc'){
   //   caller = new RPCCaller({
@@ -79,9 +81,7 @@ function perform_function(context,request,response){
           });
           
           if(acp){
-            console.log('send data ' + String(idx+1) + ' of ' + String(data.length))
             send_storage(caller,dc_meta,el_data,sname,function(err){
-              console.log('OK>>')
               if(!err){
                 idx++;
                 callback(null);