Reload97 / sate24-to-kisel

Download as
Browse Code ยป

Commit a67ecb3cec64984b65e8607f574ad8590be3d918

Authored by Adhidarma Hadiwinoto
1 parent e9b7b9dce1
Exists in master

expresso

Showing 2 changed files with 19 additions and 13 deletions Side-by-side Diff

1 1 var fs = require('fs');
2 2 var ini = require('ini');
  3 +var expresso = require('sate24-expresso');
  4 +
3 5 var config = ini.parse(fs.readFileSync(__dirname + '/config.ini', 'utf-8'));
4 6  
5 7 var logger = require('sate24/logger.js').start();
6   -
7   -var aaaHost = config.globals.aaa_host;
8   -
9   -HttpServer = require('sate24/httpserver.js');
10   -var httpServer = HttpServer.start(config, {logger: logger});
11   -
  8 +var HttpServer = require('sate24/httpserver.js');
12 9 var aaa = require('sate24/aaa.js');
13   -HttpServer.setAaa(aaa);
14   -
15 10 var partner = require('./partner-scrappingkisel.js');
16 11  
17   -var partner_options = {
  12 +var matrix = aaa.prepareMatrix();
  13 +
  14 +var options = {
18 15 'aaa': aaa,
19   - 'logger': logger
  16 + 'logger': logger,
  17 + 'config': config,
  18 + 'matrix': matrix,
20 19 }
21 20  
22   -partner.start(config, aaa.callbackReport, partner_options);
23   -aaa.start(config, partner, {logger: logger});
  21 +var httpServer = HttpServer.start(config, options);
  22 +
  23 +partner.start(config, aaa.callbackReport, options);
  24 +aaa.start(config, partner, options);
  25 +
  26 +if (config.expresso) {
  27 + expresso.start(options);
  28 +}
... ... @@ -30,6 +30,7 @@
30 30 "node-simple-router": "~0.9.4-2",
31 31 "sate24": "git+http://git@gitlab.kodesumber.com/reload97/node-sate24.git",
32 32 "winston": "~1.0.2",
33   - "ini": "~1.3.4"
  33 + "ini": "~1.3.4",
  34 + "sate24-expresso": "git+http://gitlab.kodesumber.com/reload97/sate24-expresso.git"
34 35 }
35 36 }