Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

send sms actions one by one when multiple destinations #781

Merged
merged 5 commits into from
Jun 13, 2024
Merged

send sms actions one by one when multiple destinations #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ed40ce
send sms actions one by one when multiple destinations
AlvaroVega Jun 12, 2024
d30710d
ignore lint about loop and functions
AlvaroVega Jun 12, 2024
be46392
fix to this line
AlvaroVega Jun 12, 2024
cf94689
Update smsAction.js
AlvaroVega Jun 12, 2024
a2e0a56
Update CHANGES_NEXT_RELEASE
AlvaroVega Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Send multiple sms when multiple destination in sms action
60 changes: 32 additions & 28 deletions lib/models/smsAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ function doIt(action, event, callback) {
if (options.sms && options.sms.from) {
from = options.sms.from;
}
msg = { to: buildTo(options.to), message: options.text, from: from };

metrics.IncMetrics(event.service, event.subservice, metrics.actionSMS);

var url = config.sms.URL;
var apiKey = config.sms.API_KEY;
var apiSecret = config.sms.API_SECRET;
Expand All @@ -89,33 +85,41 @@ function doIt(action, event, callback) {
apiSecret = options.sms.API_SECRET;
}
}
myutils.requestHelper(
'post',
{
url: url,
json: true,
body: msg,
headers: {
'User-Agent': 'request',
API_KEY: apiKey,
API_SECRET: apiSecret
}
},
function(err, data) {
myutils.logErrorIf(err, util.format('%s -> %s', url, msg.to));
if (err) {
metrics.IncMetrics(event.service, event.subservice, metrics.failedActionSMS);
metrics.IncMetrics(event.service, event.subservice, metrics.actionSMS);

alarm.raise(alarm.SMS);
} else {
metrics.IncMetrics(event.service, event.subservice, metrics.okActionSMS);
var tos = buildTo(options.to);

alarm.release(alarm.SMS);
for (var singleto of tos) {
msg = { to: [singleto], message: options.text, from: config.sms.from };
myutils.requestHelper(
'post',
{
url: url,
json: true,
body: msg,
headers: {
'User-Agent': 'request',
API_KEY: apiKey,
API_SECRET: apiSecret
}
},
function(err, data) { // jshint ignore:line
myutils.logErrorIf(err, util.format('%s -> %s', url, msg.to));
if (err) {
metrics.IncMetrics(event.service, event.subservice, metrics.failedActionSMS);
alarm.raise(alarm.SMS);
} else {
metrics.IncMetrics(event.service, event.subservice, metrics.okActionSMS);
alarm.release(alarm.SMS);
}
logger.info('smsAction.SendSMS done url:%s result:%j, msg: %j', url, err || data, msg);
if (tos[tos.length - 1] === singleto) {
// ensure callback is returned just one time
return callback(err, data);
}
}
logger.info('smsAction.SendSMS done url:%s result:%j, msg: %j', url, err || data, msg);
return callback(err, data);
}
);
);
}
} catch (ex) {
metrics.IncMetrics(event.service, event.subservice, metrics.failedActionSMS);

Expand Down
Loading