--no commit message

--no commit message

conf/amqp.json

 {
   "type" : "rabbitmq",
-  "url" : "amqp://lab1.igridproject.info"
+  "url" : "amqp://bigmaster.igridproject.info"
 }

conf/memstore.json

 {
   "type" : "redis",
-  "url" : "redis://:@lab1.igridproject.info:6379/1"
+  "url" : "redis://:@bigmaster.igridproject.info:6379/1"
 }

http-listener/lib/http-context.js

+module.exports.middleware = function(ctx){
+  var funcCtx = function (req, res, next) {
+    req.context = ctx;
+    next();
+  }
+
+  return funcCtx;
+}

http-listener/main.js

@@ -5,7 +5,10 @@ var app = express();
 var bodyParser = require('body-parser');
 
 var cfg = ctx.config;
+var HttpACL = ctx.getLib('lib/mems/http-acl');
+var EvenPub = ctx.getLib('lib/amqp/event-pub');
 
+const JOBCHANEL = 'job_trigger';
 
 module.exports.create = function(cfg)
 {
@@ -16,7 +19,8 @@ module.exports.create = function(cfg)
 function HTTPListener(cfg)
 {
     this.config = cfg;
-
+    this.httpacl = HttpACL.create({'conn':this.config.memstore.url});
+    this.evp = new EvenPub({'url':this.config.amqp.url,'name':JOBCHANEL});
 }
 
 HTTPListener.prototype.start = function()
@@ -31,15 +35,29 @@ HTTPListener.prototype.http_start = function()
 
   var API_PORT = 19180;
 
-  app.use(bodyParser.json({limit: '5mb'}));
+  this.httpacl.update(function(err){
+    if(!err){
+      console.log('WWW:ACL Update\t\t[OK]');
+    }else{
+      console.log('WWW:ACL Update\t\t[ERR]');
+    }
+  });
+
+  app.use(bodyParser.json({limit: '128mb'}));
   app.use(bodyParser.urlencoded({
       extended: true
   }));
 
+  var context = require('./lib/http-context');
+  app.use(context.middleware({
+    'httpacl' : self.httpacl,
+    'evp' : self.evp
+  }));
 
   app.use(require('./ws'));
 
 
+
   app.listen(API_PORT, function () {
     console.log('WWW:HTTP START\t\t[OK]');
   });

http-listener/ws/service-main.js

@@ -12,9 +12,12 @@ router.get('/:akey',function (req, res) {
     var reqHelper = request.create(req);
     var respHelper = response.create(res);
     var appkey = req.params.akey;
+    var ctx = req.context;
 
-    respHelper.responseOK({'status':'OK','appkey':appkey});
+    var httpacl = req.context.httpacl;
+    var evp = req.context.evp;
 
+    var j = httpacl.findJob(appkey,'get');
+    respHelper.responseOK({'status':'OK','appkey':appkey,'res':j});
 });
-
 module.exports = router;

lib/amqp/event-pub.js

@@ -44,4 +44,11 @@ EventPub.prototype.send = function(topic,msg,cb)
   });
 }
 
+EventPub.prototype.close = function(cb)
+{
+  var self=this;
+  self.conn.close(cb);
+
+}
+
 module.exports = EventPub;

lib/model/example/message.js

+//
+//--- BSData ---
+//
+
+var bsdata =  {
+          'object_type' : 'bsdata',
+          'data_type' : 'text,binary,object',
+          'encoding' : 'base64',
+          'data' : 'data'
+       }
+
+//
+//--- Storage Service request ---
+//
+
+var storage_write_request = {
+    'object_type' : 'storage_request',
+    'command' : 'write',
+    'param' : {
+      'storage_name' : 'gcs.file.test',
+      'meta' : {'name':'gcs'},
+      'data' : {
+        'type' : 'bsdata',
+        'value' : {
+          'data_type' : 'string',
+          'data' : 'AA00FFCC'
+        }
+      }
+    }
+}
+
+var httpdata = {
+  'object_type' : 'httpdata',
+  'method' : 'get,post',
+  'data' : {}
+}
+
+var job_trigger = {
+  'object_type':'job_trigger',
+  'source' : 'http_listener',
+  'jobId' : 'jobid',
+  'option' : {},
+  'input_data' : {
+    'type' : 'bsdata',
+    'value' : {
+      'data_type' : 'object',
+      'data' : httpdata
+    }
+  }
+}

test/test.js

@@ -78,24 +78,26 @@ const crypto = require("crypto");
 // atext = JSON.stringify(a);
 // redis.set('a',atext)
 
-// var HttpACL = ctx.getLib('lib/mems/http-acl');
-//
-// var httpacl = HttpACL.create({'conn':'redis://:@lab1.igridproject.info:6379/1'});
-//
-// httpacl.add({'appkey':'app1','method':'get','jobid':'job1'})
-// httpacl.add({'appkey':'app2','method':'get','jobid':'job2'})
-// httpacl.add({'appkey':'app1','method':'get','jobid':'job3'})
-// httpacl.commit();
-//
-// httpacl.update(function(err){
-//   //console.log(httpacl.acl);
-//   var j = httpacl.findJob('app1','get');
-//   console.log(j);
-// });
+var HttpACL = ctx.getLib('lib/mems/http-acl');
 
-var EvenPub = ctx.getLib('lib/amqp/event-pub');
+var httpacl = HttpACL.create({'conn':'redis://:@bigmaster.igridproject.info:6379/1'});
 
-var evp = new EvenPub({'url':'amqp://lab1.igridproject.info','name':'topic_logs'});
+httpacl.add({'appkey':'app1','method':'get','jobid':'job1'})
+httpacl.add({'appkey':'app2','method':'get','jobid':'job2'})
+httpacl.add({'appkey':'app1','method':'get','jobid':'job3'})
+httpacl.commit();
 
-evp.send('q.test.t1','kamron aroonrua');
-evp.send('q.test.t1','kamron aroonrua aaa');
+httpacl.update(function(err){
+  //console.log(httpacl.acl);
+  var j = httpacl.findJob('app1','get');
+  console.log(j);
+});
+
+// var EvenPub = ctx.getLib('lib/amqp/event-pub');
+//
+// var evp = new EvenPub({'url':'amqp://bigmaster.igridproject.info','name':'topic_logs'});
+//
+// evp.send('q.test.t1','kamron aroonrua');
+// evp.send('q.test.t1','kamron aroonrua aaa');
+//
+// setTimeout(function() { evp.close(function(err){console.log('close');}); }, 1500);

test/test_topic_sub.js

@@ -6,7 +6,7 @@ var amqp = require('amqplib/callback_api');
 
 
 
-amqp.connect('amqp://lab1.igridproject.info', function(err, conn) {
+amqp.connect('amqp://bigmaster.igridproject.info', function(err, conn) {
   conn.createChannel(function(err, ch) {
     var ex = 'topic_logs';