diff --git a/index.js b/index.js index 7a30ecb..74a7d26 100644 --- a/index.js +++ b/index.js @@ -1,23 +1,28 @@ var fs = require('fs'); var ini = require('ini'); +var expresso = require('sate24-expresso'); + var config = ini.parse(fs.readFileSync(__dirname + '/config.ini', 'utf-8')); var logger = require('sate24/logger.js').start(); - -var aaaHost = config.globals.aaa_host; - -HttpServer = require('sate24/httpserver.js'); -var httpServer = HttpServer.start(config, {logger: logger}); - +var HttpServer = require('sate24/httpserver.js'); var aaa = require('sate24/aaa.js'); -HttpServer.setAaa(aaa); - var partner = require('./partner-scrappingkisel.js'); -var partner_options = { +var matrix = aaa.prepareMatrix(); + +var options = { 'aaa': aaa, - 'logger': logger + 'logger': logger, + 'config': config, + 'matrix': matrix, } -partner.start(config, aaa.callbackReport, partner_options); -aaa.start(config, partner, {logger: logger}); +var httpServer = HttpServer.start(config, options); + +partner.start(config, aaa.callbackReport, options); +aaa.start(config, partner, options); + +if (config.expresso) { + expresso.start(options); +} diff --git a/package.json b/package.json index d7176ba..1100dd8 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "node-simple-router": "~0.9.4-2", "sate24": "git+http://git@gitlab.kodesumber.com/reload97/node-sate24.git", "winston": "~1.0.2", - "ini": "~1.3.4" + "ini": "~1.3.4", + "sate24-expresso": "git+http://gitlab.kodesumber.com/reload97/sate24-expresso.git" } }