From 3d22698af81261453331e047f1fbf635b32c588d Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <adhisimon@gmail.com>
Date: Tue, 8 Feb 2022 12:10:58 +0700
Subject: [PATCH] Fix report order on push-task-prepaid
---
lib/client/push-task-prepaid.js | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/lib/client/push-task-prepaid.js b/lib/client/push-task-prepaid.js
index 8cbdc6b..8520543 100644
--- a/lib/client/push-task-prepaid.js
+++ b/lib/client/push-task-prepaid.js
@@ -40,10 +40,11 @@ const pusher = (xid, task, gwName, retry) => {
rc: '68',
message: {
xid,
- 'KOMODO-GW-POOL': {
+ 'KOMODO-SDK-PUSH-TRX': {
msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry',
+ gwOrigin: config.partner.handler_name,
+ gwTarget: gwName,
retried: retry || 0,
- gwName,
},
},
}, xid);
@@ -67,10 +68,11 @@ const pusher = (xid, task, gwName, retry) => {
rc: '91',
message: {
xid,
- 'KOMODO-GW-POOL': {
+ 'KOMODO-SDK-PUSH-TRX': {
msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded',
+ gwOrigin: config.partner.handler_name,
+ gwTarget: gwName,
retried: retry || 0,
- gwName,
},
},
}, xid);
@@ -79,10 +81,24 @@ const pusher = (xid, task, gwName, retry) => {
return;
}
- logger.verbose(`${MODULE_NAME} 1E8EB9B9: Pushing task`, {
+ const pushReportMsg = `${MODULE_NAME} 1E8EB9B9: Pushing task to related gateway`;
+ logger.verbose(pushReportMsg, {
xid, gwName, task,
});
+ report({
+ trx_id: task.trx_id,
+ rc: '68',
+ message: {
+ xid,
+ 'KOMODO-SDK-PUSH-TRX': {
+ msg: pushReportMsg,
+ gwOrigin: config.partner.handler_name,
+ gwTarget: gwName,
+ },
+ },
+ });
+
ws.send(JSON.stringify({
type: 'TASK',
ts: new Date(),
@@ -92,17 +108,6 @@ const pusher = (xid, task, gwName, retry) => {
}));
logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName });
- report({
- trx_id: task.trx_id,
- rc: '68',
- message: {
- xid,
- 'KOMODO-GW-POOL': {
- msg: '7D3CECCA Task pushed to related gateway',
- gwName,
- },
- },
- });
};
module.exports = pusher;
--
1.9.0