Compare View
Commits (2)
Changes
Showing 4 changed files Side-by-side Diff
CHANGELOG.md
... | ... | @@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d |
4 | 4 | |
5 | 5 | Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). |
6 | 6 | |
7 | +#### [v0.1.14](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.13...v0.1.14) | |
8 | + | |
9 | +- Fix report order on push-task-prepaid [`3d22698`](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/commit/3d22698af81261453331e047f1fbf635b32c588d) | |
10 | + | |
7 | 11 | #### [v0.1.13](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.12...v0.1.13) |
8 | 12 | |
13 | +> 7 February 2022 | |
14 | + | |
9 | 15 | #### [v0.1.12](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.11...v0.1.12) |
10 | 16 | |
11 | 17 | > 7 February 2022 |
lib/client/push-task-prepaid.js
... | ... | @@ -40,10 +40,11 @@ const pusher = (xid, task, gwName, retry) => { |
40 | 40 | rc: '68', |
41 | 41 | message: { |
42 | 42 | xid, |
43 | - 'KOMODO-GW-POOL': { | |
43 | + 'KOMODO-SDK-PUSH-TRX': { | |
44 | 44 | msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry', |
45 | + gwOrigin: config.partner.handler_name, | |
46 | + gwTarget: gwName, | |
45 | 47 | retried: retry || 0, |
46 | - gwName, | |
47 | 48 | }, |
48 | 49 | }, |
49 | 50 | }, xid); |
... | ... | @@ -67,10 +68,11 @@ const pusher = (xid, task, gwName, retry) => { |
67 | 68 | rc: '91', |
68 | 69 | message: { |
69 | 70 | xid, |
70 | - 'KOMODO-GW-POOL': { | |
71 | + 'KOMODO-SDK-PUSH-TRX': { | |
71 | 72 | msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded', |
73 | + gwOrigin: config.partner.handler_name, | |
74 | + gwTarget: gwName, | |
72 | 75 | retried: retry || 0, |
73 | - gwName, | |
74 | 76 | }, |
75 | 77 | }, |
76 | 78 | }, xid); |
... | ... | @@ -79,10 +81,24 @@ const pusher = (xid, task, gwName, retry) => { |
79 | 81 | return; |
80 | 82 | } |
81 | 83 | |
82 | - logger.verbose(`${MODULE_NAME} 1E8EB9B9: Pushing task`, { | |
84 | + const pushReportMsg = `${MODULE_NAME} 1E8EB9B9: Pushing task to related gateway`; | |
85 | + logger.verbose(pushReportMsg, { | |
83 | 86 | xid, gwName, task, |
84 | 87 | }); |
85 | 88 | |
89 | + report({ | |
90 | + trx_id: task.trx_id, | |
91 | + rc: '68', | |
92 | + message: { | |
93 | + xid, | |
94 | + 'KOMODO-SDK-PUSH-TRX': { | |
95 | + msg: pushReportMsg, | |
96 | + gwOrigin: config.partner.handler_name, | |
97 | + gwTarget: gwName, | |
98 | + }, | |
99 | + }, | |
100 | + }); | |
101 | + | |
86 | 102 | ws.send(JSON.stringify({ |
87 | 103 | type: 'TASK', |
88 | 104 | ts: new Date(), |
... | ... | @@ -92,17 +108,6 @@ const pusher = (xid, task, gwName, retry) => { |
92 | 108 | })); |
93 | 109 | |
94 | 110 | logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName }); |
95 | - report({ | |
96 | - trx_id: task.trx_id, | |
97 | - rc: '68', | |
98 | - message: { | |
99 | - xid, | |
100 | - 'KOMODO-GW-POOL': { | |
101 | - msg: '7D3CECCA Task pushed to related gateway', | |
102 | - gwName, | |
103 | - }, | |
104 | - }, | |
105 | - }); | |
106 | 111 | }; |
107 | 112 | |
108 | 113 | module.exports = pusher; |
package-lock.json
1 | 1 | { |
2 | 2 | "name": "komodo-sdk-push-trx", |
3 | - "version": "0.1.13", | |
3 | + "version": "0.1.14", | |
4 | 4 | "lockfileVersion": 2, |
5 | 5 | "requires": true, |
6 | 6 | "packages": { |
7 | 7 | "": { |
8 | 8 | "name": "komodo-sdk-push-trx", |
9 | - "version": "0.1.13", | |
9 | + "version": "0.1.14", | |
10 | 10 | "license": "ISC", |
11 | 11 | "dependencies": { |
12 | 12 | "express": "^4.17.2", |