diff --git a/src/backups.js b/src/backups.js index a373699f5..a6ee0d2ed 100644 --- a/src/backups.js +++ b/src/backups.js @@ -792,12 +792,12 @@ function backupBoxAndApps(auditSource, callback) { progress.set(progress.BACKUP, step * processed, 'Backing up system data'); - backupBoxWithAppBackupIds(backupIds, timestamp, function (error, filename) { + backupBoxWithAppBackupIds(backupIds, timestamp, function (error, backupId) { progress.set(progress.BACKUP, 100, error ? error.message : ''); - eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { errorMessage: error ? error.message : null, filename: filename }); + eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { errorMessage: error ? error.message : null, backupId: backupId, timestamp: timestamp }); - callback(error, filename); + callback(error, backupId); }); }); }); diff --git a/src/mail_templates/digest.ejs b/src/mail_templates/digest.ejs index 8f4cc6581..ca1c037e6 100644 --- a/src/mail_templates/digest.ejs +++ b/src/mail_templates/digest.ejs @@ -47,7 +47,7 @@ The following apps were updated: <% }}} -%> <% if (info.finishedBackups.length) { -%> -Last successful backup: <%- info.finishedBackups[0].filename %> +Last successful backup: <%- info.finishedBackups[0].backupId || info.finishedBackups[0].filename %> <% } else { -%> This Cloudron did **not** backup successfully in the last week! @@ -152,7 +152,7 @@ Sent at: <%= new Date().toUTCString() %> <% } %> <% if (info.finishedBackups.length) { %> -

Last successful backup : <%= info.finishedBackups[0].filename %>

+

Last successful backup : <%= info.finishedBackups[0].backupId || info.finishedBackups[0].filename %>

<% } else { %>

This Cloudron did not backup successfully in the last week!

<% } %>