Reload97 / sate24-to-pulsakita

Download as
Browse Code ยป

Commit 66e7cb63fc9b706f09f6b391bbaeab6b8b0b45b5

Authored by Adhidarma Hadiwinoto
1 parent b53ba3002b
Exists in master

logger

Showing 3 changed files with 26 additions and 15 deletions Side-by-side Diff

... ... @@ -2,7 +2,9 @@ var url = require('url');
2 2 var math = require('mathjs');
3 3 var request = require('request');
4 4 var xml = require("xml2js").parseString;
  5 +var winston = require('winston');
5 6  
  7 +var logger;
6 8 var config;
7 9 var callbackReport;
8 10  
... ... @@ -21,7 +23,7 @@ function parseSN(message, _config) {
21 23 var sn_match = message.match(sn_regex);
22 24  
23 25 if (sn_match <= 0) {
24   - console.log('SN Not found: ' + message);
  26 + logger.info('SN Not found: ' + message);
25 27 return '';
26 28 }
27 29  
... ... @@ -69,23 +71,20 @@ function topupRequest(task, retry) {
69 71 produk: task['remoteProduct'],
70 72 tujuan: task['destination']
71 73 };
72   - console.log('PARAMS:');
73   - console.log(params);
  74 + logger.info('Creating http request to gateway', {params: params});
74 75  
75 76 request.post({url: config.h2h_out.partner, form: params}, function(err, httpResponse, httpResponseBody) {
76 77  
77 78 config.globals.active_requests_count--;
78 79  
79 80 if (err) {
80   - console.log('HTTP Request Error (' + task['requestId'] + '): ');
81   - console.log(err);
  81 + logger.warn('HTTP Request Error (' + task['requestId'] + '): ' + err);
82 82  
83 83 callbackReport(task['requestId'], '40', 'Gangguan koneksi ke suplier');
84 84 return;
85 85 }
86 86  
87   - console.log('Server Response: ');
88   - console.log(httpResponseBody);
  87 + logger.info('Got response from gateway ', {response_body: httpResponseBody});
89 88  
90 89 if (httpResponseBody.indexOf('502 Proxy Error') >= 0) {
91 90 callbackReport(task['requestId'], '40', '502 Proxy error');
... ... @@ -94,14 +93,13 @@ function topupRequest(task, retry) {
94 93  
95 94 xml(httpResponseBody, function(err, result) {
96 95 if (err) {
97   - console.log('Gagal parsing XML respon server');
  96 + logger.warn('Gagal parsing XML respon server');
98 97 //topupRequest(task, retry - 1);
99 98 callbackReport(task['requestId'], '40', 'Gagal parsing XML pada respon server');
100 99 return;
101 100 }
102 101  
103   - console.log('Response Data:');
104   - console.log(result);
  102 + logger.info('Response Data:', {result: result});
105 103  
106 104 var response_code = result.respon.rc[0].replace(/^00/, '');
107 105 if (response_code == '54' || response_code == '68') {
... ... @@ -148,9 +146,19 @@ function topupRequest(task, retry) {
148 146 });
149 147 }
150 148  
151   -function start(_config, _callbackReport) {
  149 +function start(_config, _callbackReport, options) {
152 150 config = _config;
153 151 callbackReport = _callbackReport
  152 +
  153 + if (options && options.logger) {
  154 + logger = options.logger;
  155 + } else {
  156 + logger = new winston.Logger({
  157 + transports: [
  158 + new (winston.transports.Console)()
  159 + ]
  160 + });
  161 + }
154 162 }
155 163  
156 164 function parseResult(message) {
1 1 var iniparser = require('iniparser');
2 2 var config = iniparser.parseSync('./config.ini');
3 3  
  4 +var logger = require('sate24/logger.js').start();
  5 +
4 6 var aaaHost = config.globals.aaa_host;
5 7  
6 8 HttpServer = require('sate24/httpserver.js');
7   -var httpServer = HttpServer.start(config);
  9 +var httpServer = HttpServer.start(config, {logger: logger});
8 10  
9 11 var aaa = require('sate24/aaa.js');
10 12 HttpServer.setAaa(aaa);
11 13  
12 14 var partner = require('./httppulsakita.js');
13 15  
14   -partner.start(config, aaa.callbackReport);
15   -aaa.start(config, partner);
  16 +partner.start(config, aaa.callbackReport, {aaa: aaa, logger: logger});
  17 +aaa.start(config, partner, {logger: logger});
... ... @@ -28,6 +28,7 @@
28 28 "mathjs": "~1.7.0",
29 29 "xmlrpc": "~1.3.1",
30 30 "xml2js": "~0.4.9",
31   - "sate24": "git+http://git@gitlab.kodesumber.com/reload97/node-sate24.git"
  31 + "sate24": "git+http://git@gitlab.kodesumber.com/reload97/node-sate24.git",
  32 + "winston": "~1.0.1"
32 33 }
33 34 }