move mailer notification of failed backups

this also removes the splatchError which is causing a crash because
of infinite recursion when backups fail (not sure why)
This commit is contained in:
Girish Ramakrishnan
2019-03-04 15:00:23 -08:00
parent b1b2bd5b97
commit f6213595d1
4 changed files with 18 additions and 18 deletions
+2 -15
View File
@@ -47,17 +47,6 @@ var MAIL_TEMPLATES_DIR = path.join(__dirname, 'mail_templates');
var gMailQueue = [ ];
function splatchError(error) {
var result = { };
Object.getOwnPropertyNames(error).forEach(function (key) {
var value = this[key];
if (value instanceof Error) value = splatchError(value);
result[key] = value;
}, error /* thisArg */);
return util.inspect(result, { depth: null, showHidden: true });
}
function getAdminEmails(callback) {
users.getAllAdmins(function (error, admins) {
if (error) return callback(error);
@@ -459,9 +448,7 @@ function sendDigest(info) {
});
}
function backupFailed(error) {
var message = splatchError(error);
function backupFailed(errorMessage) {
getMailConfig(function (error, mailConfig) {
if (error) return debug('Error getting mail details:', error);
@@ -469,7 +456,7 @@ function backupFailed(error) {
from: mailConfig.notificationFrom,
to: config.provider() === 'caas' ? 'support@cloudron.io' : mailConfig.adminEmails.join(', '),
subject: util.format('[%s] Failed to backup', mailConfig.cloudronName),
text: render('backup_failed.ejs', { cloudronName: mailConfig.cloudronName, message: message, format: 'text' })
text: render('backup_failed.ejs', { cloudronName: mailConfig.cloudronName, message: errorMessage, format: 'text' })
};
enqueue(mailOptions);