Commit b403448adb43d790a3a6c6f7fa2e35d351bd1505

Authored by Adhidarma Hadiwinoto
1 parent dc2d0f90ec
Exists in master and in 1 other branch dev

Refactor some matrix

Showing 4 changed files with 25 additions and 12 deletions Side-by-side Diff

lib/core-callback/index.js
... ... @@ -23,7 +23,7 @@ app.use((req, res, next) => {
23 23 app.use(middlewareCommon);
24 24  
25 25 app.use((req, res) => {
26   - matrix.messages_from_core += 1;
  26 + matrix.core.received += 1;
27 27 res.end('OK');
28 28 sender(req.query, res.locals.xid);
29 29 });
lib/core-callback/sender.js
... ... @@ -100,12 +100,12 @@ const sender = async (data, xid, retry) => {
100 100 headers: axiosHeaders,
101 101 });
102 102  
103   - matrix.callback_sender.message_sent += 1;
  103 + matrix.callback_sender.sent += 1;
104 104  
105 105 if (isPostpaid) {
106   - matrix.callback_sender.message_sent_using_post_method += 1;
  106 + matrix.callback_sender.sent_using_post += 1;
107 107 } else {
108   - matrix.callback_sender.message_sent_using_get_method += 1;
  108 + matrix.callback_sender.sent_using_get += 1;
109 109 }
110 110  
111 111 logger.info(`${MODULE_NAME} 3641FBD7: Has been sent to PARTNER successfully`, {
... ... @@ -115,7 +115,7 @@ const sender = async (data, xid, retry) => {
115 115 responseBody: response && response.data,
116 116 });
117 117 } catch (e) {
118   - matrix.callback_sender.message_sent_failed += 1;
  118 + matrix.callback_sender.sent_failed += 1;
119 119 matrix.callback_sender.last_error = {
120 120 xid,
121 121 ts: new Date(),
... ... @@ -12,13 +12,17 @@ module.exports = {
12 12 workdir: process.cwd(),
13 13 memory_usage: process.memoryUsage(),
14 14 nodejs_versions: process.versions,
15   - messages_from_core: 0,
16   - messages_to_core: 0,
  15 + core: {
  16 + received: 0,
  17 + sent: 0,
  18 + sent_failed: 0,
  19 + last_error: null,
  20 + },
17 21 callback_sender: {
18   - message_sent: 0,
19   - message_sent_failed: 0,
20   - message_sent_using_get_method: 0,
21   - message_sent_using_post_method: 0,
  22 + sent: 0,
  23 + sent_failed: 0,
  24 + sent_using_get: 0,
  25 + sent_using_post: 0,
22 26 last_error: null,
23 27 },
24 28 };
lib/partner-listener/routers/topup.js
... ... @@ -59,7 +59,7 @@ async function pageIndex(req, res) {
59 59  
60 60 const terminalName = `${req.body.terminal_name || req.query.terminal_name}@${req.ip.replace(/^::ffff:/, '')}`;
61 61  
62   - matrix.messages_to_core += 1;
  62 + matrix.core.sent += 1;
63 63  
64 64 const [err, coreResponse] = await coreapi({
65 65 xid,
... ... @@ -78,6 +78,15 @@ async function pageIndex(req, res) {
78 78 });
79 79  
80 80 if (err || !coreResponse) {
  81 + matrix.core.sent_failed += 1;
  82 + matrix.core.last_error = {
  83 + xid,
  84 + ts: new Date(),
  85 + e: err,
  86 + eCode: err.code,
  87 + eMessage: err.message,
  88 + };
  89 +
81 90 logger.warn(`${MODULE_NAME} 8DEBE15F: ERROR on /prepaid/buy response`, {
82 91 xid,
83 92 err,