Commit 41d90907 authored by Kamron Aroonrua's avatar Kamron Aroonrua 💬

ipc fixed

parent 37d73b68
[
{"env":"BSCONFIG_AMQP_TYPE","conf":"amqp.type"},
{"env":"BSCONFIG_AMQP_URL","conf":"amqp.url"}
]
\ No newline at end of file
...@@ -24,14 +24,17 @@ function perform_function(context,request,response){ ...@@ -24,14 +24,17 @@ function perform_function(context,request,response){
var amqp_cfg = ctx.config.amqp; var amqp_cfg = ctx.config.amqp;
var storage_name = param.storage_name; var storage_name = param.storage_name;
var caller = storagecaller; var caller = new RPCCaller({
url : amqp_cfg.url,
name :'storage_request'
});
if(param.channel!='ipc'){ // if(param.channel!='ipc'){
caller = new RPCCaller({ // caller = new RPCCaller({
url : amqp_cfg.url, // url : amqp_cfg.url,
name :'storage_request' // name :'storage_request'
}); // });
} // }
var dc_meta = { var dc_meta = {
......
var ctx = require('../context'); var ctx = require('../context');
var ConnCtx = ctx.getLib('lib/conn/connection-context'); var ConnCtx = ctx.getLib('lib/conn/connection-context');
var rpcserver = ctx.getLib('lib/amqp/rpcserver'); var rpcserver = ctx.getLib('lib/amqp/rpcserver');
var RPCCaller = ctx.getLib('lib/amqp/rpccaller');
var SSServer = ctx.getLib('lib/axon/rpcserver'); var SSServer = ctx.getLib('lib/axon/rpcserver');
var Db = ctx.getLib('storage-service/lib/db'); var Db = ctx.getLib('storage-service/lib/db');
var WorkerPool = ctx.getLib('storage-service/lib/worker_pool'); var WorkerPool = ctx.getLib('storage-service/lib/worker_pool');
...@@ -145,7 +146,11 @@ SS.prototype.http_start = function() ...@@ -145,7 +146,11 @@ SS.prototype.http_start = function()
})); }));
var context = ctx.getLib('lib/ws/http-context'); var context = ctx.getLib('lib/ws/http-context');
this.storagecaller = new SSCaller({'url':SS_URL}); //this.storagecaller = new SSCaller({'url':SS_URL});
this.storagecaller = new RPCCaller({
url : amqp_cfg.url,
name :'storage_request'
});
this.acl_validator = ACLValidator.create(auth_cfg); this.acl_validator = ACLValidator.create(auth_cfg);
this.worker_pool.initWorker(); this.worker_pool.initWorker();
app.use(context.middleware({ app.use(context.middleware({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment