call options

Adhidarma Hadiwinoto
1 parent 2f3c516f88
Showing 1 changed file with 9 additions and 7 deletions Side-by-side Diff
index.js
@@ -5,22 +5,24 @@ var config = iniparser.parseSync(&#39;./config.ini&#39;);
 var aaaHost = config.globals.aaa_host;
  
 var logger = require('sate24/logger.js').start();
-
-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('./gentong.js');
  
+var matrix = aaa.prepareMatrix();
+
 var options = {
     'aaa': aaa,
     'logger': logger,
     'config': config,
+    'matrix': matrix,
     'expresso_views': 'node_modules/sate24-expresso/views'
 }
  
+//var httpServer = HttpServer.start(config, {logger: logger});
+var httpServer = HttpServer.start(config, options);
+//HttpServer.setAaa(aaa);
+
 partner.start(config, aaa.callbackReport, options);
-aaa.start(config, partner, {logger: logger});
+aaa.start(config, partner, options);
 expresso.start(options);
...	...	@@ -5,22 +5,24 @@ var config = iniparser.parseSync('./config.ini');
5	5	var aaaHost = config.globals.aaa_host;
6	6
7	7	var logger = require('sate24/logger.js').start();
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('./gentong.js');
16	11
	12	+var matrix = aaa.prepareMatrix();
	13	+
17	14	var options = {
18	15	'aaa': aaa,
19	16	'logger': logger,
20	17	'config': config,
	18	+ 'matrix': matrix,
21	19	'expresso_views': 'node_modules/sate24-expresso/views'
22	20	}
23	21
	22	+//var httpServer = HttpServer.start(config, {logger: logger});
	23	+var httpServer = HttpServer.start(config, options);
	24	+//HttpServer.setAaa(aaa);
	25	+
24	26	partner.start(config, aaa.callbackReport, options);
25		-aaa.start(config, partner, {logger: logger});
	27	+aaa.start(config, partner, options);
26	28	expresso.start(options);