Compare View
Commits (3)
Changes
Showing 2 changed files Side-by-side Diff
center/messaging/trx-center.js
... | ... | @@ -53,7 +53,8 @@ function executeBalanceCheck(paramsFromTransport) { |
53 | 53 | url: config.core_url + '/services/balance', |
54 | 54 | qs: { |
55 | 55 | terminal_name: terminal_name, |
56 | - password: password | |
56 | + password: password, | |
57 | + msg: paramsFromTransport.msg | |
57 | 58 | } |
58 | 59 | } |
59 | 60 | |
... | ... | @@ -68,6 +69,7 @@ function executePriceCheck(paramsFromTransport) { |
68 | 69 | keyword: paramsFromTransport.msg.trim().split(/[\., ]+/)[1], |
69 | 70 | password: paramsFromTransport.msg.trim().split(/[\., ]+/)[2], |
70 | 71 | postpaid: 0, |
72 | + msg: paramsFromTransport.msg | |
71 | 73 | } |
72 | 74 | } |
73 | 75 | |
... | ... | @@ -190,22 +192,32 @@ function requestToCore(requestOptions, cb) { |
190 | 192 | request(requestOptions, function(err, res, body) { |
191 | 193 | if (err || res.statusCode != 200) { |
192 | 194 | logger.warn('Error requesting to CORE', {module_name: module_name, method_name: 'requestToCore', requestOptions: requestOptions, err: err}); |
195 | + let msg = "INTERNAL ERROR"; | |
196 | + if (requestOptions.qs.msg) { | |
197 | + msg = requestOptions.qs.msg + ": " + msg; | |
198 | + } | |
199 | + | |
193 | 200 | if (cb) { |
194 | - cb(null, {msg: requestOptions.qs.msg + ': INTERNAL ERROR'}); | |
201 | + cb(null, {msg: msg}); | |
195 | 202 | } |
196 | 203 | else if (transport.send) { |
197 | - transport.send(requestOptions.qs.terminal_name, requestOptions.qs.msg + ': INTERNAL ERROR'); | |
204 | + transport.send(requestOptions.qs.terminal_name, msg); | |
198 | 205 | } |
199 | 206 | return; |
200 | 207 | } |
201 | 208 | |
202 | 209 | let result = parseCoreMessage(body); |
203 | 210 | if (!result || !result.message) { |
211 | + let msg = "INTERNAL ERROR"; | |
212 | + if (requestOptions.qs.msg) { | |
213 | + msg = requestOptions.qs.msg + ": " + msg; | |
214 | + } | |
215 | + | |
204 | 216 | if (cb) { |
205 | - cb(null, {msg: 'INTERNAL ERROR'}); | |
217 | + cb(null, {msg: msg}); | |
206 | 218 | } |
207 | 219 | else if (transport.send) { |
208 | - transport.send(requestOptions.qs.terminal_name, 'INTERNAL ERROR'); | |
220 | + transport.send(requestOptions.qs.terminal_name, msg); | |
209 | 221 | } |
210 | 222 | return; |
211 | 223 | } |