From d073f46c90718542288846e593a59ab1718655c4 Mon Sep 17 00:00:00 2001 From: Adhidarma Hadiwinoto <gua@adhisimon.org> Date: Thu, 10 Dec 2015 21:45:37 +0700 Subject: [PATCH] resync with others --- httppulsakita.js | 7 ++++++- index.js | 24 ++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/httppulsakita.js b/httppulsakita.js index 3d27e8c..14a85fb 100644 --- a/httppulsakita.js +++ b/httppulsakita.js @@ -7,6 +7,7 @@ var winston = require('winston'); var logger; var config; var callbackReport; +var aaa; var max_retry = 15; var sleep_before_retry = 60 * 1000; @@ -170,7 +171,11 @@ function topupRequest(task, retry) { function start(_config, _callbackReport, options) { config = _config; - callbackReport = _callbackReport + callbackReport = _callbackReport; + + if (options && options.aaa) { + aaa = options.aaa; + } if (options && options.logger) { logger = options.logger; diff --git a/index.js b/index.js index 92cc368..0bd4ae6 100644 --- a/index.js +++ b/index.js @@ -1,19 +1,27 @@ var fs = require('fs'); var ini = require('ini'); +var expresso = require('sate24-expresso'); var config = ini.parse(fs.readFileSync(__dirname + '/config.ini', 'utf-8')); +process.chdir(__dirname); var logger = require('sate24/logger.js').start(); +var HttpServer = require('sate24/httpserver.js'); +var aaa = require('sate24/aaa.js'); +var partner = require('./httppulsakita.js'); -var aaaHost = config.globals.aaa_host; +var matrix = aaa.prepareMatrix(); -HttpServer = require('sate24/httpserver.js'); -var httpServer = HttpServer.start(config, {logger: logger}); +var options = { + 'aaa': aaa, + 'logger': logger, + 'config': config, + 'matrix': matrix, +} -var aaa = require('sate24/aaa.js'); -HttpServer.setAaa(aaa); +var httpServer = HttpServer.start(config, options); -var partner = require('./httppulsakita.js'); +partner.start(config, aaa.callbackReport, options); +aaa.start(config, partner, options); +expresso.start(options); -partner.start(config, aaa.callbackReport, {aaa: aaa, logger: logger}); -aaa.start(config, partner, {logger: logger}); -- 1.9.0