Commit 8ec1a4b4549c978c4b67bf6a7fa6c31f1a1c490a
1 parent
23f71bcad7
Exists in
master
uninstall lru-cache
Showing 2 changed files with 4 additions and 18 deletions Side-by-side Diff
package.json
... | ... | @@ -21,7 +21,6 @@ |
21 | 21 | "dependencies": { |
22 | 22 | "crypto": "0.0.3", |
23 | 23 | "ini": "^1.3.4", |
24 | - "lru-cache": "^4.0.1", | |
25 | 24 | "sate24": "git+http://gitlab.kodesumber.com/reload97/node-sate24.git", |
26 | 25 | "sate24-expresso": "git+http://gitlab.kodesumber.com/reload97/sate24-expresso.git", |
27 | 26 | "winston": "^2.2.0", |
partner-cjk.js
... | ... | @@ -4,14 +4,12 @@ var xml = require('xml'); |
4 | 4 | var url = require('url'); |
5 | 5 | var http = require('http'); |
6 | 6 | var xml2js = require('xml2js').parseString; |
7 | -var LRU = require("lru-cache"); | |
8 | 7 | |
9 | 8 | var config; |
10 | 9 | var callbackReport; |
11 | 10 | var aaa; |
12 | 11 | var logger; |
13 | 12 | var options; |
14 | -var taskCache = LRU({max: 2000}); | |
15 | 13 | |
16 | 14 | var maxRetry = 10; |
17 | 15 | var sleepBeforeRetry = 30; |
... | ... | @@ -100,11 +98,11 @@ function supplierRcToST24Rc(rc) { |
100 | 98 | } |
101 | 99 | } |
102 | 100 | |
103 | -function topupResponseHandler(body) { | |
101 | +function topupResponseHandler(body, task) { | |
104 | 102 | //logger.info('Got reply from partner', {body: body}); |
105 | 103 | xml2js(body, function(err, result) { |
106 | 104 | if (err) { |
107 | - logger.warn('Got invalid XML from partner', {err: err, body: body}); | |
105 | + logger.warn('Got invalid XML from partner', {err: err, body: body, task: task}); | |
108 | 106 | } |
109 | 107 | logger.info('XML message from partner', {result: result}); |
110 | 108 | |
... | ... | @@ -119,12 +117,6 @@ function topupResponseHandler(body) { |
119 | 117 | trxid = result.ciwaru.trxid[0]; |
120 | 118 | } |
121 | 119 | |
122 | - var task = taskCache.get(trxid); | |
123 | - if (!task) { | |
124 | - logger.warn('Got reply for undefined task'); | |
125 | - return; | |
126 | - } | |
127 | - | |
128 | 120 | if (message.toUpperCase().indexOf('PENDING') >= 0) { |
129 | 121 | rc = '68'; |
130 | 122 | } |
... | ... | @@ -147,7 +139,6 @@ function topupResponseHandler(body) { |
147 | 139 | |
148 | 140 | if (rc == '68') { |
149 | 141 | task.retry--; |
150 | - taskCache.set(trxid, task); | |
151 | 142 | |
152 | 143 | if (task.retry) { |
153 | 144 | logger.info('Got pending status, retrying in ' + sleepBeforeRetry + 's'); |
... | ... | @@ -156,8 +147,6 @@ function topupResponseHandler(body) { |
156 | 147 | else { |
157 | 148 | logger.warn('Maximum retry for pending status exceeded', {task: task}); |
158 | 149 | } |
159 | - } else { | |
160 | - taskCache.del(trxid); | |
161 | 150 | } |
162 | 151 | }); |
163 | 152 | } |
... | ... | @@ -167,9 +156,7 @@ function topupRequest(task, retry) { |
167 | 156 | if (retry === undefined) { |
168 | 157 | task.retry = maxRetry; |
169 | 158 | } |
170 | - | |
171 | - taskCache.set(task.requestId, task); | |
172 | - | |
159 | + | |
173 | 160 | var remoteProduct = task.remoteProduct.split(','); |
174 | 161 | |
175 | 162 | var params = { |
... | ... | @@ -203,7 +190,7 @@ function topupRequest(task, retry) { |
203 | 190 | var buffer = ""; |
204 | 191 | res.on( "data", function( data ) { buffer = buffer + data; } ); |
205 | 192 | res.on( "end", function( data ) { |
206 | - topupResponseHandler(buffer); | |
193 | + topupResponseHandler(buffer, task); | |
207 | 194 | }); |
208 | 195 | }); |
209 | 196 |