resync with others

Adhidarma Hadiwinoto
1 parent 76e39b15cc
Showing 2 changed files with 22 additions and 9 deletions Side-by-side Diff
httppulsakita.js
index.js
@@ -7,6 +7,7 @@ var winston = require(&#39;winston&#39;);
 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;
 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});
...	...	@@ -7,6 +7,7 @@ var winston = require('winston');
7	7	var logger;
8	8	var config;
9	9	var callbackReport;
	10	+var aaa;
10	11
11	12	var max_retry = 15;
12	13	var sleep_before_retry = 60 * 1000;
...	...	@@ -170,7 +171,11 @@ function topupRequest(task, retry) {
170	171
171	172	function start(_config, _callbackReport, options) {
172	173	config = _config;
173		- callbackReport = _callbackReport
	174	+ callbackReport = _callbackReport;
	175	+
	176	+ if (options && options.aaa) {
	177	+ aaa = options.aaa;
	178	+ }
174	179
175	180	if (options && options.logger) {
176	181	logger = options.logger;
1	1	var fs = require('fs');
2	2	var ini = require('ini');
	3	+var expresso = require('sate24-expresso');
3	4	var config = ini.parse(fs.readFileSync(__dirname + '/config.ini', 'utf-8'));
4	5
	6	+process.chdir(__dirname);
5	7
6	8	var logger = require('sate24/logger.js').start();
	9	+var HttpServer = require('sate24/httpserver.js');
	10	+var aaa = require('sate24/aaa.js');
	11	+var partner = require('./httppulsakita.js');
7	12
8		-var aaaHost = config.globals.aaa_host;
	13	+var matrix = aaa.prepareMatrix();
9	14
10		-HttpServer = require('sate24/httpserver.js');
11		-var httpServer = HttpServer.start(config, {logger: logger});
	15	+var options = {
	16	+ 'aaa': aaa,
	17	+ 'logger': logger,
	18	+ 'config': config,
	19	+ 'matrix': matrix,
	20	+}
12	21
13		-var aaa = require('sate24/aaa.js');
14		-HttpServer.setAaa(aaa);
	22	+var httpServer = HttpServer.start(config, options);
15	23
16		-var partner = require('./httppulsakita.js');
	24	+partner.start(config, aaa.callbackReport, options);
	25	+aaa.start(config, partner, options);
	26	+expresso.start(options);
17	27
18		-partner.start(config, aaa.callbackReport, {aaa: aaa, logger: logger});
19		-aaa.start(config, partner, {logger: logger});