Skip to content

fix(wrappers/cron): don't leave an unhandled rejection when a bot promise rejects #225

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

Open
MrCooper42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(wrappers/cron): don't leave an unhandled rejection when a bot promise rejects #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 27 additions & 17 deletions wrappers/cron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,34 @@ module.exports = function(configOverride, botHandler) {
callback(null, err || data);
});
});
if (promise && typeof promise.then == "function" && botHandler.length < 3) {
promise.then(data => {
cmdLogger.log("[LEOCRON]:complete:" + cronkey);
cron.reportComplete(event.__cron, context.awsRequestId, err ? "error" : "complete", err ? err : '', {}, function(err2, data2) {
if (err || err2) {
logger.log(err || err2);
}
callback(null, err || data);
});
});
}
if (promise && typeof promise.catch == "function") {
promise.catch(err => {
cmdLogger.log("[LEOCRON]:complete:" + cronkey);
cron.reportComplete(event.__cron, context.awsRequestId, "error", err, {}, function() {
callback(null, err);
});
// A rejection needs exactly one handler. Attaching .then() and .catch()
// to the same promise made them siblings rather than a chain: on
// rejection the .catch() reported the bot complete, but the
// .then()-derived chain stayed unhandled, and Node's default
// unhandledRejection mode ("throw") then killed the process after the
// bot had already been reported complete. Passing the rejection
// handler as then()'s second argument keeps the previous behaviour of
// both branches while leaving no unhandled chain behind.
let onRejected = err => {
cmdLogger.log("[LEOCRON]:complete:" + cronkey);
cron.reportComplete(event.__cron, context.awsRequestId, "error", err, {}, function() {
callback(null, err);
});
};
if (promise && typeof promise.then == "function") {
if (botHandler.length < 3) {
promise.then(data => {
cmdLogger.log("[LEOCRON]:complete:" + cronkey);
cron.reportComplete(event.__cron, context.awsRequestId, err ? "error" : "complete", err ? err : '', {}, function(err2, data2) {
if (err || err2) {
logger.log(err || err2);
}
callback(null, err || data);
});
}, onRejected);
} else if (typeof promise.catch == "function") {
promise.catch(onRejected);
}
}
}).catch(err => {
cron.reportComplete(event.__cron, context.awsRequestId, "error", err, {}, function() {
Expand Down