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 | +#### [v1.44.3](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.44.2...v1.44.3) | |
| 8 | + | |
| 9 | +- Log on sdkTrxIdAdder [`603be10`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/603be10d7cc527f94bc32ecda3f11fed3976f0cf) | |
| 10 | + | |
| 7 | 11 | #### [v1.44.2](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.44.1...v1.44.2) |
| 8 | 12 | |
| 13 | +> 13 January 2022 | |
| 14 | + | |
| 9 | 15 | - Add push to github on npm postversion [`715bf26`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/715bf267093e9c7e7d6b1b87b1d4c5b020054961) |
| 10 | 16 | |
| 11 | 17 | #### [v1.44.1](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.44.0...v1.44.1) |
gateway/pull.js
| ... | ... | @@ -131,7 +131,9 @@ function replaceRc(originalRc) { |
| 131 | 131 | return config.replace_rc[originalRc] || originalRc; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | -function report(data, xid) { | |
| 134 | +function report(data, xidFromCaller) { | |
| 135 | + const xid = xidFromCaller || uniqid(); | |
| 136 | + | |
| 135 | 137 | let corePullReportUrl; |
| 136 | 138 | |
| 137 | 139 | if (data && data.trx_id && data.rc) { |
| ... | ... | @@ -161,12 +163,24 @@ function report(data, xid) { |
| 161 | 163 | data.misc.advice_url = config.push_server.advice.url; |
| 162 | 164 | } |
| 163 | 165 | |
| 164 | - let trxId = Number(data.trx_id) - (Number(config.sdk_trx_id_adder) || 0); | |
| 166 | + const sdkTrxIdAdder = Number(config.sdk_trx_id_adder) || 0; | |
| 167 | + let trxId = Number(data.trx_id) - sdkTrxIdAdder; | |
| 168 | + | |
| 169 | + if (sdkTrxIdAdder) { | |
| 170 | + logger.verbose(`${MODULE_NAME} 3E0016E8: REPORT: Adjusting trx id`, { | |
| 171 | + xid, | |
| 172 | + sdkTrxIdAdder, | |
| 173 | + trxId: data.trx_id, | |
| 174 | + adjustedTrxId: trxId, | |
| 175 | + }); | |
| 176 | + } | |
| 177 | + | |
| 165 | 178 | if (trxId <= 0) { |
| 166 | 179 | logger.warn(`${MODULE_NAME} 6A8C7303: REPORT: calculated trx_id is a negative number, using uncalculated trx_id`, { |
| 180 | + xid, | |
| 167 | 181 | uncalculated: data.trx_id, |
| 168 | 182 | calculated: trxId, |
| 169 | - sdk_trx_id_adder: config.sdk_trx_id_adder, | |
| 183 | + sdkTrxIdAdder, | |
| 170 | 184 | }); |
| 171 | 185 | trxId = data.trx_id; |
| 172 | 186 | } |
| ... | ... | @@ -257,8 +271,17 @@ function forwardCoreTaskToPartner(coreMessage, startTime, xid) { |
| 257 | 271 | incrementCounterTrx(); |
| 258 | 272 | |
| 259 | 273 | task.remote_product = getRemoteProduct(task.product); |
| 260 | - if (Number(config.sdk_trx_id_adder)) { | |
| 261 | - task.trx_id = Number(task.trx_id) + Number(config.sdk_trx_id_adder); | |
| 274 | + const sdkTrxIdAdder = Number(config.sdk_trx_id_adder); | |
| 275 | + if (sdkTrxIdAdder) { | |
| 276 | + const newTrxId = Number(task.trx_id) + sdkTrxIdAdder; | |
| 277 | + logger.verbose(`${MODULE_NAME} 873BA19B: Adjusting trx id`, { | |
| 278 | + xid, | |
| 279 | + sdkTrxIdAdder, | |
| 280 | + originalTrxId: task.trx_id, | |
| 281 | + newTrxId, | |
| 282 | + }); | |
| 283 | + | |
| 284 | + task.trx_id = newTrxId; | |
| 262 | 285 | } |
| 263 | 286 | |
| 264 | 287 | putTaskToMatrix(task); |
package-lock.json
| 1 | 1 | { |
| 2 | 2 | "name": "komodo-sdk", |
| 3 | - "version": "1.44.2", | |
| 3 | + "version": "1.44.3", | |
| 4 | 4 | "lockfileVersion": 2, |
| 5 | 5 | "requires": true, |
| 6 | 6 | "packages": { |
| 7 | 7 | "": { |
| 8 | 8 | "name": "komodo-sdk", |
| 9 | - "version": "1.44.2", | |
| 9 | + "version": "1.44.3", | |
| 10 | 10 | "license": "ISC", |
| 11 | 11 | "dependencies": { |
| 12 | 12 | "array-unique": "^0.3.2", |