Mailing defaults to sendmail, optional keywords

pull/231/head
chelid 2022-09-14 13:27:30 +03:00 committed by GitHub
parent 1d1ec29dc2
commit 5bfc5bd215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions

View File

@ -5,7 +5,15 @@ var crontab = require("../crontab.js");
var nodemailer = require('nodemailer'); var nodemailer = require('nodemailer');
crontab.get_crontab(process.argv[process.argv.length -1 -2], function(job){ crontab.get_crontab(process.argv[process.argv.length -1 -2], function(job){
if (job.mailing.transporterStr == 'sendmail') { // allow sending mail with Postfix if (!job.mailing || job.mailing == undefined || job.mailing.mailOptions == undefined) {
var mailOptions = defaults.mailOptions;
var transporterStr = defaults.transporterStr;
} else {
var mailOptions = job.mailing.mailOptions;
var transporterStr = job.mailing.transporterStr ;
}
if (transporterStr == 'sendmail') { // allow sending mail with Postfix, and this is the default option
var transporter = nodemailer.createTransport({ var transporter = nodemailer.createTransport({
sendmail: true, sendmail: true,
newline: 'unix', newline: 'unix',
@ -15,10 +23,21 @@ crontab.get_crontab(process.argv[process.argv.length -1 -2], function(job){
} else { } else {
var transporter = nodemailer.createTransport(job.mailing.transporterStr); var transporter = nodemailer.createTransport(job.mailing.transporterStr);
} }
var mailOptions = job.mailing.mailOptions;
mailOptions.subject = job.name + ' ' + mailOptions.subject; const keywordsMap = {
mailOptions.text = 'Command: ' + job.command + "\n" + mailOptions.text; '#COMMAND_NAME#': job.name,
mailOptions.html = 'Command: ' + job.command + '<br/>' + mailOptions.html; '#COMMAND#': job.command,
'#HASHED_EMAIL#': Buffer.from(mailOptions.to).toString('base64')
};
function replaceAll(str,mapObj){
var re = new RegExp(Object.keys(mapObj).join("|"),"gi");
return str.replace(re, function(matched){
return mapObj[matched];
});
}
mailOptions.subject = replaceAll(mailOptions.subject, keywordsMap);
mailOptions.text = replaceAll(mailOptions.text, keywordsMap);
mailOptions.html = replaceAll(mailOptions.html, keywordsMap);
mailOptions.attachments = [{filename: "stdout.txt", path: process.argv[process.argv.length -1 -1]}, {filename: "stderr.txt", path: process.argv[process.argv.length -1]}]; mailOptions.attachments = [{filename: "stdout.txt", path: process.argv[process.argv.length -1 -1]}, {filename: "stderr.txt", path: process.argv[process.argv.length -1]}];