Commit 22b2e217b4f8daaef4446974beba392969ccca30
1 parent
12f4a793da
Exists in
master
failed handler retry max 300 secs
Showing 1 changed file with 7 additions and 9 deletions Side-by-side Diff
lib/smstools-handler/failed.js
... | ... | @@ -6,6 +6,7 @@ const mailparser = require('../mailparser-wrapper'); |
6 | 6 | const config = require('../../config'); |
7 | 7 | |
8 | 8 | const eventType = 'FAILED'; |
9 | +const maxSecondsToRetry = 5 * 60; | |
9 | 10 | |
10 | 11 | module.exports = async (msgFilename) => { |
11 | 12 | const msg = await fs.promises.readFile(msgFilename); |
... | ... | @@ -38,7 +39,7 @@ module.exports = async (msgFilename) => { |
38 | 39 | const originalTsParsed = originalTs && moment(originalTs, 'YYYYMMDD_HHmmss'); |
39 | 40 | |
40 | 41 | const deltaTimeMs = originalTsParsed && Number(new Date() - originalTsParsed); |
41 | - const retry = (deltaTimeMs && (deltaTimeMs < (15 * 60 * 1000))) | |
42 | + const retry = (deltaTimeMs && (deltaTimeMs < (maxSecondsToRetry * 1000))) | |
42 | 43 | && !config.smstools_disable_retry_on_failed; |
43 | 44 | |
44 | 45 | logger.verbose('Sent failed detected', { |
... | ... | @@ -50,26 +51,23 @@ module.exports = async (msgFilename) => { |
50 | 51 | imei, |
51 | 52 | failReason, |
52 | 53 | failed, |
53 | - text, | |
54 | 54 | originalTsParsed, |
55 | 55 | deltaTimeMs, |
56 | + maxSecondsToRetry, | |
57 | + configAllowRetry: config.smstools_disable_retry_on_failed, | |
56 | 58 | retry, |
59 | + text, | |
60 | + textLength: text.length, | |
57 | 61 | }); |
58 | 62 | |
59 | 63 | if (!retry) { |
60 | - logger.verbose('Not retry because of expired message', { | |
61 | - eventType, | |
62 | - msgFile: msgFilename, | |
63 | - to, | |
64 | - text, | |
65 | - }); | |
66 | 64 | return; |
67 | 65 | } |
68 | 66 | |
69 | 67 | try { |
70 | 68 | await fs.promises.unlink(msgFilename); |
71 | 69 | } catch (e) { |
72 | - logger.warn(`Can not unlink failed message. ${e.message || e.toString()}`, { | |
70 | + logger.warn(`Can not unlink failed message for send retry. ${e.message || e.toString()}`, { | |
73 | 71 | eventType, |
74 | 72 | msgFile: msgFilename, |
75 | 73 | to, |